[ipcamera] Fix Reolink does not detect bad user or passwords. (#17589)

* Fix Reolink does not detect bad user or password.
* Improve logging to include URL

Signed-off-by: Matthew Skinner <matt@pcmus.com>

diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/ReolinkHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/ReolinkHandler.java
index 5ea9b76eccd2f007666f6482c101ac15636613d3..5c552faddd2769c73f3316cf766bdc6dad2eedbc 100644 (file)
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/ReolinkHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/ReolinkHandler.java
@@ -89,7 +89,8 @@ public class ReolinkHandler extends ChannelDuplexHandler {
                         ipCameraHandler.sendHttpPOST("/api.cgi?cmd=GetAbility" + ipCameraHandler.reolinkAuth,
                                 "[{ \"cmd\":\"GetAbility\", \"param\":{ \"User\":{ \"userName\":\"admin\" }}}]");
                     } else {
-                        ipCameraHandler.logger.info("Your Reolink camera gave a bad login response:{}", content);
+                        ipCameraHandler.cameraConfigError(
+                                "Check your user and password are correct as the Reolink camera gave a bad login response");
                     }
                     break;
                 case "/api.cgi?cmd=GetAbility": // Used to check what channels the camera supports
@@ -172,7 +173,7 @@ public class ReolinkHandler extends ChannelDuplexHandler {
                         }
                         if (getAbilityResponse[0].value.ability.supportAudioAlarmEnable == null
                                 || getAbilityResponse[0].value.ability.supportAudioAlarmEnable.permit == 0) {
-                            ipCameraHandler.logger.debug("Camera has no AudioAlarm support.");
+                            ipCameraHandler.logger.debug("Camera has no support for controlling AudioAlarms.");
                             channel = ipCameraHandler.getThing().getChannel(CHANNEL_THRESHOLD_AUDIO_ALARM);
                             if (channel != null) {
                                 removeChannels.add(channel);

diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
index fe834f1cd5c6734c8e0c7985f1f2eb24cd886dfc..f4c7ba0d053d57bb92d4d3dc07e8d4f46cc52be9 100644 (file)
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
@@ -357,8 +357,8 @@ public class IpCameraHandler extends BaseThingHandler {
                 logger.debug("Camera sent {} bytes when the content-length header was {}.", bytesAlreadyRecieved,
                         bytesToRecieve);
             } else {
-                logger.warn("!!!! Camera possibly closed the channel on the binding, cause reported is: {}",
-                        cause.getMessage());
+                logger.warn("Camera possibly closed the channel on the binding for URL: {}, cause reported is: {}",
+                        requestUrl, cause.getMessage());
             }
             ctx.close();
         }
@@ -386,7 +386,7 @@ public class IpCameraHandler extends BaseThingHandler {
                             return; // don't auto close this as it is for the alarms.
                         }
                     }
-                    logger.debug("Closing an idle channel for camera: {}", cameraConfig.getIp());
+                    logger.debug("Closing an idle channel for {}{}", cameraConfig.getIp(), requestUrl);
                     ctx.close();
                 }
             }

diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifCodec.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifCodec.java
index f3e43c0fbf99909d33687eb994abf85f90419e5a..d208a4fdc6f394c6fc1e11ac58b774331a6923f6 100644 (file)
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifCodec.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifCodec.java
@@ -50,8 +50,26 @@ public class OnvifCodec extends ChannelDuplexHandler {
         }
         try {
             if (msg instanceof HttpResponse response) {
-                if (response.status().code() != 200) {
-                    logger.trace("ONVIF replied with code {} message is {}", response.status().code(), msg);
+                switch (response.status().code()) {
+                    case 200:
+                        break;
+                    case 401:
+                        if (!response.headers().isEmpty()) {
+                            for (CharSequence name : response.headers().names()) {
+                                for (CharSequence value : response.headers().getAll(name)) {
+                                    if ("WWW-Authenticate".equalsIgnoreCase(name.toString())) {
+                                        logger.debug(
+                                                "ONVIF {} replied with WWW-Authenticate header:{}, camera may require ONVIF Profile-T support.",
+                                                requestType, value.toString());
+                                    }
+                                }
+                            }
+                        }
+                    default:
+                        logger.trace("ONVIF {} replied with code {}, the message is {}", requestType,
+                                response.status().code(), msg);
+                        ctx.close();
+                        return;
                 }
             }
             if (msg instanceof HttpContent content) {
@@ -73,11 +91,11 @@ public class OnvifCodec extends ChannelDuplexHandler {
         }
         if (evt instanceof IdleStateEvent) {
             IdleStateEvent e = (IdleStateEvent) evt;
-            logger.debug("IdleStateEvent received: {}", e.state());
+            logger.debug("IdleStateEvent received for {} : {}", requestType, e.state());
             onvifConnection.setIsConnected(false);
             ctx.close();
         } else {
-            logger.debug("ONVIF netty channel event occurred: {}", evt);
+            logger.debug("ONVIF {} netty channel event occurred: {}", requestType, evt);
         }
     }
 
@@ -86,7 +104,7 @@ public class OnvifCodec extends ChannelDuplexHandler {
         if (ctx == null || cause == null) {
             return;
         }
-        logger.debug("Exception on ONVIF connection: {}", cause.getMessage());
+        logger.debug("Exception on ONVIF {} connection: {}", requestType, cause.getMessage());
         ctx.close();
     }
 

diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java
index bbe4457e073a447aaf0f8c4224906564dc2807e9..3d796348edc41b404c67f47b511481dbde72083e 100644 (file)
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java
@@ -700,7 +700,7 @@ public class OnvifConnection {
     public void eventRecieved(String eventMessage) {
         String topic = Helper.fetchXML(eventMessage, "Topic", "tns1:");
         if (topic.isEmpty()) {
-            logger.debug("No ONVIF Events occured in the last 8 seconds");
+            logger.trace("No ONVIF Events occured in the last 8 seconds");
             return;
         }
         String dataName = Helper.fetchXML(eventMessage, "tt:Data", "Name=\"");