MT#64295 better handling of via_route empty string

* transform via_route empty string into undef and store
  it as undef without validating it against SIP-URI

Change-Id: Iefae7b26910201183ae3d049b3785a68dc81ce64
mr14.1
Kirill Solomko 2 weeks ago
parent a97490e97d
commit c417cc622d

@ -137,6 +137,8 @@ sub transform_via_route {
$uri =~ s/^\s*([^\s]+)\s*$/$1/g;
$uri || return undef;
unless ($uri =~ /^</) {
$uri = '<' . $uri . ';lr>';
}
@ -152,7 +154,7 @@ sub transform_via_route {
sub validate_via_route {
my ($self, $field) = @_;
my $uri = $field->value;
my $uri = $field->value || return;
unless ($field->value =~ /^<?sip\:[^\s]+:\d+;lr>?$/) {
$field->add_error("Invalid SIP URI, must be a valid SIP URI in the form of sip:ip:port");

@ -72,13 +72,17 @@ sub pre_process_form_resource {
$uri =~ s/^\s*([^\s]+)\s*$/$1/g;
unless ($uri =~ /^</) {
$uri = '<' . $uri . ';lr>';
}
unless ($uri =~ /;lr>$/) {
$uri =~ s/>$//;
$uri = $uri . ';lr>';
if ($uri) {
unless ($uri =~ /^</) {
$uri = '<' . $uri . ';lr>';
}
unless ($uri =~ /;lr>$/) {
$uri =~ s/>$//;
$uri = $uri . ';lr>';
}
} else {
$uri = undef;
}
$resource->{via_route} = $uri;

Loading…
Cancel
Save