Fix auth failed error

Author: szantogab

build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 }
 
 group = "be.teletask.onvif"
-version = "1.1.14"
+version = "1.1.15"
 
 dependencies {
     implementation(kotlin("stdlib"))

src/main/java/be/teletask/onvif/DiscoveryManager.java

@@ -16,7 +16,7 @@ public class DiscoveryManager {
     public static final String TAG = DiscoveryManager.class.getSimpleName();
 
     //Attributes
-    private OnvifDiscovery discovery;
+    private final OnvifDiscovery discovery;
 
     //Constructors
 

src/main/java/be/teletask/onvif/DiscoveryThread.java

@@ -18,10 +18,10 @@ public class DiscoveryThread extends Thread {
     public static final String TAG = DiscoveryThread.class.getSimpleName();
 
     //Attributes
-    private DatagramSocket server;
-    private int timeout;
-    private DiscoveryParser parser;
-    private DiscoveryCallback callback;
+    private final DatagramSocket server;
+    private final int timeout;
+    private final DiscoveryParser parser;
+    private final DiscoveryCallback callback;
 
     //Constructors
     DiscoveryThread(DatagramSocket server, int timeout, DiscoveryMode mode, DiscoveryCallback callback) {

src/main/java/be/teletask/onvif/OnvifDiscovery.java

@@ -38,7 +38,7 @@ public class OnvifDiscovery {
     public static final String TAG = OnvifDiscovery.class.getSimpleName();
     private static final String MULTICAST_ADDRESS_IPV4 = "239.255.255.250"; // Simple Service Discovery Protocol
     private static final String MULTICAST_ADDRESS_IPV6 = "[FF02::C]";
-    private static int DISCOVERY_TIMEOUT = 10000;
+    private static final int DISCOVERY_TIMEOUT = 10000;
 
     private static final Random random = new SecureRandom();
 
@@ -105,24 +105,26 @@ void probe(DiscoveryMode mode, DiscoveryListener discoveryListener) {
 
     private void broadcast(List<InetAddress> addresses) {
         //Our list will be accessed by multiple threads, hence ConcurrentSkipListSet
-        Collection<Device> devices = new ConcurrentSkipListSet<>();
+        final Collection<Device> devices = new ConcurrentSkipListSet<>();
 
         //Create a new cached thread pool and a monitor service
-        ExecutorService executorService = Executors.newCachedThreadPool();
-        ExecutorService monitor = Executors.newSingleThreadExecutor();
-        CountDownLatch latch = new CountDownLatch(addresses.size());
-        List<Runnable> runnables = new ArrayList<>();
+        final ExecutorService executorService = Executors.newCachedThreadPool();
+        final ExecutorService monitor = Executors.newSingleThreadExecutor();
+        final CountDownLatch latch = new CountDownLatch(addresses.size());
+        final List<Runnable> runnables = new ArrayList<>();
+
+        OnvifPacket packet = createDiscoveryPacket();
+        byte[] data = packet.getData();
 
         //Add runnables to the list to be executed in order
         for (InetAddress address : addresses) {
+            if (address.isLoopbackAddress() || !(address instanceof Inet4Address)) continue;
+
             runnables.add(() -> {
                 try {
-                    OnvifPacket packet = createDiscoveryPacket();
-                    byte[] data = packet.getData();
-
                     int port = random.nextInt(20000) + 40000;
 
-                    DatagramSocket client = new DatagramSocket(port, address);
+                    final DatagramSocket client = new DatagramSocket(port, address);
                     client.setBroadcast(true);
 
                     //Start a new thread to listen for incoming UDP packages
@@ -198,10 +200,10 @@ private OnvifPacket createDiscoveryPacket() {
     List<InetAddress> getInterfaceAddresses() {
         List<InetAddress> addresses = new ArrayList<>();
         try {
-            Enumeration interfaces = NetworkInterface.getNetworkInterfaces();
+            Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
 
             while (interfaces.hasMoreElements()) {
-                NetworkInterface networkInterface = (NetworkInterface) interfaces.nextElement();
+                NetworkInterface networkInterface = interfaces.nextElement();
 
                 if (networkInterface.isLoopback() || !networkInterface.isUp()) {
                     continue; // Don't want to broadcast to the loopback interface

src/main/java/be/teletask/onvif/OnvifExecutor.java

@@ -17,6 +17,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Created by Tomas Verhelst on 03/09/2018.
@@ -26,37 +28,41 @@ public class OnvifExecutor {
 
     //Constants
     public static final String TAG = OnvifExecutor.class.getSimpleName();
+    private static final Logger LOGGER = Logger.getLogger(OnvifExecutor.class.getName());
 
     //Attributes
-    private final OkHttpClient client;
     private final MediaType reqBodyType = MediaType.parse("application/soap+xml; charset=utf-8;");
-    private final Credentials credentials = new Credentials("", "");
+    private final ConcurrentHashMap<String, OkHttpClient> clientPool = new ConcurrentHashMap<>();
     private OnvifResponseListener onvifResponseListener;
 
     //Constructors
 
     OnvifExecutor(OnvifResponseListener onvifResponseListener) {
         this.onvifResponseListener = onvifResponseListener;
+    }
 
-        DigestAuthenticator authenticator = new DigestAuthenticator(credentials);
-        Map<String, CachingAuthenticator> authCache = new ConcurrentHashMap<>();
-
-        client = new OkHttpClient.Builder()
-                .connectTimeout(3, TimeUnit.SECONDS)
-                .writeTimeout(5, TimeUnit.SECONDS)
-                .readTimeout(0, TimeUnit.SECONDS) // PullMessages can keep the connection open longer, timeout will be applied per request
-                .addInterceptor(new AuthenticationCacheInterceptor(authCache))
-                .authenticator(new CachingAuthenticatorDecorator(authenticator, authCache))
-                .build();
+    /**
+     * Visszaadja vagy létrehozza az OkHttpClient példányt az adott eszközhöz
+     */
+    private OkHttpClient getClientForDevice(OnvifDevice device) {
+        String deviceKey = device.getHostName() + ":" + device.getUsername();
+        return clientPool.computeIfAbsent(deviceKey, key -> {
+            Credentials deviceCredentials = new Credentials(device.getUsername(), device.getPassword());
+            DigestAuthenticator authenticator = new DigestAuthenticator(deviceCredentials);
+            Map<String, CachingAuthenticator> authCache = new ConcurrentHashMap<>();
+
+            return new OkHttpClient.Builder()
+                    .connectTimeout(3, TimeUnit.SECONDS)
+                    .writeTimeout(5, TimeUnit.SECONDS)
+                    .readTimeout(0, TimeUnit.SECONDS) // PullMessages can keep the connection open longer, timeout will be applied per request
+                    .addInterceptor(new AuthenticationCacheInterceptor(authCache))
+                    .authenticator(new CachingAuthenticatorDecorator(authenticator, authCache))
+                    .build();
+        });
     }
 
     //Methods
 
-    private synchronized void setCredentials(String username, String password) {
-        credentials.setUserName(username);
-        credentials.setPassword(password);
-    }
-
     <T> void sendRequest(OnvifDevice device, OnvifRequest<T> request) {
         sendRequest(device, request, 5);
     }
@@ -65,12 +71,9 @@ <T> void sendRequest(OnvifDevice device, OnvifRequest<T> request) {
      * Sends a request to the Onvif-compatible device.
      */
     <T> void sendRequest(OnvifDevice device, OnvifRequest<T> request, int timeoutSeconds) {
-        String body;
-        synchronized (credentials) {
-            setCredentials(device.getUsername(), device.getPassword());
-            body = OnvifXMLBuilder.getSoapHeader(credentials, request.getSoapHeader()) + request.getXml() + OnvifXMLBuilder.getEnvelopeEnd();
-        }
-
+        Credentials deviceCredentials = new Credentials(device.getUsername(), device.getPassword());
+        String body = OnvifXMLBuilder.getSoapHeader(deviceCredentials, request.getSoapHeader()) + request.getXml() + OnvifXMLBuilder.getEnvelopeEnd();
+        LOGGER.log(Level.INFO, "Onvif Sending Request: {0}", body);
         performXmlRequest(device, request, buildOnvifRequest(device, request, RequestBody.create(body, reqBodyType)), timeoutSeconds);
     }
 
@@ -79,6 +82,12 @@ <T> void sendRequest(OnvifDevice device, OnvifRequest<T> request, int timeoutSec
      */
     void clear() {
         onvifResponseListener = null;
+        // Kliensek leállítása és erőforrások felszabadítása
+        for (OkHttpClient client : clientPool.values()) {
+            client.dispatcher().executorService().shutdown();
+            client.connectionPool().evictAll();
+        }
+        clientPool.clear();
     }
 
     //Properties
@@ -94,14 +103,13 @@ public void setOnvifResponseListener(OnvifResponseListener onvifResponseListener
      * @param listener Válasz listener (ByteArray)
      */
     void downloadSnapshot(OnvifDevice device, String snapshotUri, int timeoutSeconds, OnvifRequest.Listener<byte[]> listener) {
-        setCredentials(device.getUsername(), device.getPassword());
-
         Request request = new Request.Builder()
                 .url(snapshotUri)
                 .get()
                 .build();
 
-        final Call call = client.newCall(request);
+        OkHttpClient deviceClient = getClientForDevice(device);
+        final Call call = deviceClient.newCall(request);
         call.timeout().timeout(timeoutSeconds, TimeUnit.SECONDS);
 
         try (Response response = call.execute()) {
@@ -127,7 +135,8 @@ void downloadSnapshot(OnvifDevice device, String snapshotUri, int timeoutSeconds
     private <T> void performXmlRequest(OnvifDevice device, OnvifRequest<T> request, Request xmlRequest, int timeoutSeconds) {
         if (xmlRequest == null) return;
 
-        final Call call = client.newCall(xmlRequest);
+        OkHttpClient deviceClient = getClientForDevice(device);
+        final Call call = deviceClient.newCall(xmlRequest);
         call.timeout().timeout(timeoutSeconds, TimeUnit.SECONDS);
 
         try (Response xmlResponse = call.execute()) {

src/main/java/be/teletask/onvif/OnvifXMLBuilder.java

@@ -35,7 +35,9 @@ public static String getSoapHeader(Credentials cred, String extraHeader) {
                 byte[] bytes = new byte[20];
                 new Random().nextBytes(bytes);
                 nonce = Base64.getEncoder().encodeToString(bytes);
-                created = ZonedDateTime.now().format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+
+                // Use UTC time explicitly to avoid timezone issues
+                created = ZonedDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 
                 byte[] createdByteArray = created.getBytes(StandardCharsets.UTF_8);
                 byte[] passwordByteArray = cred.getPassword().getBytes(StandardCharsets.UTF_8);
@@ -46,6 +48,7 @@ public static String getSoapHeader(Credentials cred, String extraHeader) {
 
                 md.update(c);
                 digest = Base64.getEncoder().encodeToString(md.digest());
+
             } catch (NoSuchAlgorithmException e) {
                 e.printStackTrace();
             }

src/main/java/be/teletask/onvif/parsers/GetEventBrokersParser.java

@@ -47,3 +47,5 @@ public List<String> parse(OnvifResponse response) {
 
 
 
+
+

src/main/java/be/teletask/onvif/requests/AddEventBrokerRequest.java

@@ -49,3 +49,5 @@ public OnvifType getType() {
 
 
 
+
+

src/main/java/be/teletask/onvif/requests/DeleteEventBrokerRequest.java

@@ -47,3 +47,5 @@ public OnvifType getType() {
 
 
 
+
+

src/main/java/be/teletask/onvif/requests/GetEventBrokerRequest.java

@@ -44,3 +44,5 @@ public OnvifType getType() {
 
 
 
+
+