Fixed duplicate host IP in URL for commit

hknutzen · Oct 9, 2024 · e95371f · e95371f
1 parent 6c584ce
commit e95371f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 {{$NEXT}}
 
+ - Fixed URL for committing changes to device of type PAN-OS.
+   Previously the URL looked like
+   https://address/api/?key=xxx&https://address/api/?key=xxx&type=commit
+
 3.034     2024-10-04 10:26:33+02:00 Europe/Berlin
 
  - For device of type ASA that has interface not known by Netspoc,

diff --git a/go/pkg/panos/device.go b/go/pkg/panos/device.go
@@ -199,8 +199,7 @@ func (s *State) ApplyCommands(logFH *os.File) error {
 		return parseResponse(body)
 	}
 	commit := func() error {
-		cmd := s.urlPrefix +
-			"type=commit&action=partial&cmd=<commit><partial><admin><member>" +
+		cmd := "type=commit&action=partial&cmd=<commit><partial><admin><member>" +
 			s.devUser + "</member></admin></partial></commit>"
 		msg, data, err := doCmd(cmd)
 		if err != nil {
@@ -227,8 +226,7 @@ func (s *State) ApplyCommands(logFH *os.File) error {
 			if !simulated {
 				time.Sleep(10 * time.Second)
 			}
-			cmd := s.urlPrefix +
-				"type=op&cmd=<show><jobs><id>" + id + "</id></jobs></show>"
+			cmd := "type=op&cmd=<show><jobs><id>" + id + "</id></jobs></show>"
 			_, data, err := doCmd(cmd)
 			if err != nil {
 				return err

diff --git a/go/testdata/pan-os_simul.t b/go/testdata/pan-os_simul.t
@@ -225,10 +225,10 @@ TESTSERVER/api/?key=xxx&action=set&type=config&xpath=/config/devices/entry[@name
 TESTSERVER/api/?key=xxx&action=set&type=config&xpath=/config/devices/entry[@name='localhost.localdomain']/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='r1']&element=<action>allow</action><from><member>z1</member></from><to><member>z2</member></to><source><member>any</member></source><destination><member>any</member></destination><service><member>tcp 80</member></service><application><member>any</member></application><rule-type>interzone</rule-type>
 <response status="success" code="20"></response>
 
-TESTSERVER/api/?key=xxx&TESTSERVER/api/?key=xxx&type=commit&action=partial&cmd=<commit><partial><admin><member>admin</member></admin></partial></commit>
+TESTSERVER/api/?key=xxx&type=commit&action=partial&cmd=<commit><partial><admin><member>admin</member></admin></partial></commit>
 <response status="success" code="19"><result><job>6</job></result></response>
 
-TESTSERVER/api/?key=xxx&TESTSERVER/api/?key=xxx&type=op&cmd=<show><jobs><id>6</id></jobs></show>
+TESTSERVER/api/?key=xxx&type=op&cmd=<show><jobs><id>6</id></jobs></show>
 <response status="success"><result><job>
 <result>OK</result>
 </job></result></response>