mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2025-12-23 22:37:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return uri from guess_credentials. Add a warning when no ip in ping

Browse Source
This commit is contained in:
Isaac Connor
2025-09-01 09:35:16 -04:00
parent ba3f9439c0
commit a534f9b429
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/ZoneMinder/lib/ZoneMinder/Control.pm
View File

@@ -405,6 +405,7 @@ sub guess_credentials {
my $self = shift;
require URI;
my $uri;
# Extract the username/password host/port from ControlAddress
if ($self->{Monitor}{ControlAddress}
@@ -414,7 +415,7 @@ sub guess_credentials {
$self->{Monitor}{ControlAddress} ne 'user:port@ip'
) {
Debug("Using ControlAddress for credentials: $self->{Monitor}{ControlAddress}");
my $uri = URI->new($self->{Monitor}->{ControlAddress});
$uri = URI->new($self->{Monitor}->{ControlAddress});
$uri = URI->new('http://'.$self->{Monitor}->{ControlAddress}) if ref($uri) eq 'URI::_foreign';
$$self{host} = $uri->host();
if ( $uri->userinfo()) {
@@ -443,7 +444,7 @@ sub guess_credentials {
$$self{username}= $self->{Monitor}->{User} if $self->{Monitor}->{User} and !$$self{username};
$$self{password} = $self->{Monitor}->{Pass} if $self->{Monitor}->{Pass} and !$$self{password};
}
my $uri = URI->new($self->{Monitor}->{Path});
$uri = URI->new($self->{Monitor}->{Path});
$uri->scheme('http');
$uri->port(80);
$uri->path('');
@@ -452,6 +453,7 @@ sub guess_credentials {
} else {
Debug('Unable to guess credentials');
}
return $uri;
}
sub get_realm {
@@ -501,7 +503,10 @@ sub get_realm {
sub ping {
my $self = shift;
my $ip = @_ ? shift : $$self{host};
return undef if ! $ip;
if (!$ip) {
Warning("No ip to ping. Please either pass ip or populate self{host}");
return undef;
}
require Net::Ping;
Debug("Pinging $ip");