refactor: check_ssl is async by default
This commit is contained in:
@@ -439,15 +439,14 @@ sub check_url_reachable_async {
|
|||||||
|
|
||||||
sub check_ssl_certificate {
|
sub check_ssl_certificate {
|
||||||
my ( $self, $url ) = @_;
|
my ( $self, $url ) = @_;
|
||||||
|
return Mojo::Promise->resolve(1) unless defined $url && length $url;
|
||||||
return Mojo::Promise->reject('URL is required')
|
|
||||||
unless defined $url && length($url) > 0;
|
|
||||||
|
|
||||||
my $parsed = $self->_parse_url($url);
|
my $parsed = $self->_parse_url($url);
|
||||||
return Mojo::Promise->resolve(1)
|
return Mojo::Promise->resolve(1)
|
||||||
unless $parsed && $parsed->scheme && $parsed->scheme eq 'https';
|
unless $parsed && $parsed->scheme && $parsed->scheme eq 'https';
|
||||||
|
|
||||||
return $self->ua->head_p($url)->then( sub { return 1; } )->catch(
|
$self->_fire_and_forget(
|
||||||
|
$self->ua->head_p($url)->then( sub { return 1; } )->catch(
|
||||||
sub {
|
sub {
|
||||||
my $err = shift;
|
my $err = shift;
|
||||||
my $err_str = "$err";
|
my $err_str = "$err";
|
||||||
@@ -461,13 +460,9 @@ sub check_ssl_certificate {
|
|||||||
return Mojo::Promise->reject(
|
return Mojo::Promise->reject(
|
||||||
$self->_format_error_message( $error_type, $err_str ) );
|
$self->_format_error_message( $error_type, $err_str ) );
|
||||||
}
|
}
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
sub check_ssl_certificate_async {
|
|
||||||
my ( $self, $url ) = @_;
|
|
||||||
return Mojo::Promise->resolve(1) unless defined $url && length $url;
|
|
||||||
$self->_fire_and_forget( $self->check_ssl_certificate($url) );
|
|
||||||
return Mojo::Promise->resolve(1);
|
return Mojo::Promise->resolve(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -507,7 +502,7 @@ sub validate_url_with_checks {
|
|||||||
|
|
||||||
my $ssl_check =
|
my $ssl_check =
|
||||||
$parsed->scheme eq 'https'
|
$parsed->scheme eq 'https'
|
||||||
? $self->check_ssl_certificate_async($normalized)
|
? $self->check_ssl_certificate($normalized)
|
||||||
: Mojo::Promise->resolve(1);
|
: Mojo::Promise->resolve(1);
|
||||||
|
|
||||||
return $ssl_check->then(
|
return $ssl_check->then(
|
||||||
|
|||||||
Reference in New Issue
Block a user