Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

[TC-385] check origin host name is IPv6 address #672

Closed
zhilhuan wants to merge 1 commit into from
Closed

[TC-385] check origin host name is IPv6 address #672

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions traffic_ops/app/lib/UI/DeliveryService.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,11 +428,23 @@ sub check_deliveryservice_input {
my $org_host_name = $self->param('ds.org_server_fqdn');
$self->field('ds.org_server_fqdn')->is_like( qr/^(https?:\/\/)/, "Origin Server Base URL must start with http(s)://" );
$org_host_name =~ s!^https?://?!!i;
$org_host_name =~ s/:(.*)$//;
my $port = defined($1) ? $1 : 80;
if ( !&is_hostname($org_host_name) || $port !~ /^[1-9][0-9]*$/ ) {
$self->field('ds.org_server_fqdn')
my $port;
if ( $org_host_name =~ /^\[.*\]/ ) { #IPv6 address
$org_host_name =~ s/\]:(.*)$//;
$port = defined($1) ? $1 : 80;
$org_host_name =~ s/^\[//;
$org_host_name =~ s/\]$//;
if ( !&is_ip6address($org_host_name) || $port !~ /^[1-9][0-9]*$/ ) {
$self->field('ds.org_server_fqdn')
->is_equal( "", $org_host_name . " is not a valid IPv6 address or " . $port . " is not a valid port");
}
} else {
$org_host_name =~ s/:(.*)$//;
$port = defined($1) ? $1 : 80;
if ( !&is_hostname($org_host_name) || $port !~ /^[1-9][0-9]*$/ ) {
$self->field('ds.org_server_fqdn')
->is_equal( "", $org_host_name . " is not a valid org server name (rfc1123) or " . $port . " is not a valid port" );
}
}
if ( $self->param('ds.http_bypass_fqdn') ne ""
&& !&is_hostname( $self->param('ds.http_bypass_fqdn') ) )
Expand Down