demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Matthew Skinner <matt@pcmus.com>
This commit is contained in:
Matthew Skinner 2024-10-20 18:55:48 +11:00 committed by GitHub
parent e9a6cb68d8
commit 273739f674
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/ReolinkHandler.java
View File

@ -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);

6
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
View File

@ -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();
}
}

28
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifCodec.java
View File

@ -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();
}

2
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java
View File

@ -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=\"");