Removed ONVIF authenticate flag (will always authenticate if there's …

…a username)
mnit-rtmc · Dec 22, 2023 · 0cb4703 · 0cb4703
1 parent edca3e5
commit 0cb4703
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 8 deletions.
diff --git a/src/us/mn/state/dot/tms/server/comm/onvifptz/DeviceService.java b/src/us/mn/state/dot/tms/server/comm/onvifptz/DeviceService.java
@@ -29,7 +29,6 @@ public DeviceService(String deviceServiceAddress, String u, String p) {
 		namespace = "http://www.onvif.org/ver10/device/wsdl";
 		username = u;
 		password = p;
-		authenticate = false;
 	}
 
 	public static DeviceService getDeviceService(String deviceServiceAddress, String u, String p) {
@@ -70,7 +69,6 @@ public Document getScopesDocument() {
 
 	/** Get the scope parameters of the device */
 	public String getScopes() {
-		authenticate = true;
 		Document doc = getScopesDocument();
 		return sendRequestDocument(doc);
 	}

diff --git a/src/us/mn/state/dot/tms/server/comm/onvifptz/ImagingService.java b/src/us/mn/state/dot/tms/server/comm/onvifptz/ImagingService.java
@@ -29,7 +29,6 @@ public ImagingService(String imagingServiceAddress, String u, String p) {
 		namespace = "http://www.onvif.org/ver20/imaging/wsdl";
 		username = u;
 		password = p;
-		authenticate = true;
 	}
 
 	public static ImagingService getImagingService(String imagingServiceAddress, String u, String p) {

diff --git a/src/us/mn/state/dot/tms/server/comm/onvifptz/MediaService.java b/src/us/mn/state/dot/tms/server/comm/onvifptz/MediaService.java
@@ -29,7 +29,6 @@ public MediaService(String mediaServiceAddress, String u, String p) {
 		namespace = "http://www.onvif.org/ver10/media/wsdl";
 		username = u;
 		password = p;
-		authenticate = true;
 	}
 
 	public static MediaService getMediaService(String mediaServiceAddress, String u, String p) {

diff --git a/src/us/mn/state/dot/tms/server/comm/onvifptz/PTZService.java b/src/us/mn/state/dot/tms/server/comm/onvifptz/PTZService.java
@@ -29,7 +29,6 @@ public PTZService(String ptzServiceAddress, String u, String p) {
 		namespace = "http://www.onvif.org/ver20/ptz/wsdl";
 		username = u;
 		password = p;
-		authenticate = true;
 	}
 
 	public static PTZService getPTZService(String ptzServiceAddress, String u, String p) {
@@ -350,7 +349,6 @@ public Document getAuxiliaryCommandDocument(String profToken, String command, St
 	 * @param state        the requested state ("On", "Off") of the wiper
 	 */
 	public String setWiper(String profileToken, String state) {
-		authenticate = true;
 		Document doc = getAuxiliaryCommandDocument(profileToken, "Wiper", state);
 		return sendRequestDocument(doc);
 	}

diff --git a/src/us/mn/state/dot/tms/server/comm/onvifptz/Service.java b/src/us/mn/state/dot/tms/server/comm/onvifptz/Service.java
@@ -50,7 +50,6 @@ public abstract class Service {
 	protected String namespace;
 	protected String username;
 	protected String password;
-	protected boolean authenticate;
 
 	/** Logger method */
 	protected void log(String s) {
@@ -174,7 +173,7 @@ public String sendRequestDocument(Document doc) {
 			connection.setDoOutput(true);
 			connection.setRequestProperty("Content-Type", "application/soap+xml; charset=utf-8");
 
-			if (authenticate && !"".equals(username)) {
+			if (!"".equals(username)) {
 				addSecurityHeaderDocument(doc);
 			} else {
 				log("Sending unauthenticated request...");