sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#11300 fix api/faxes number normalization for pbx cases

Browse Source 
Change-Id: I3751ba3310bfb685f3d55f6f5ef5cfff33900d15
changes/61/12061/1
Rene Krenn 9 years ago
parent fdf32a8a6c
commit b7daef7c84
2 changed files with 337 additions and 43 deletions
Show Stats Download Patch File Download Diff File

338
lib/NGCP/Panel/Utils/Fax.pm
Unescape View File

@ -130,57 +130,331 @@ sub process_fax_journal_item {
callee => $result->callee };
my $dir = $result->direction;
my $prov_sub = $subscriber->provisioning_voip_subscriber;
my $src_sub = $result->caller_subscriber // undef;
my $dst_sub = $result->callee_subscriber // undef;
my $src_sub = $result->caller_subscriber // undef; #undef, if not local, or if caller is username
#try finding it:
unless ($src_sub) {
my $prov_src_sub = $c->model('DB')->resultset('provisioning_voip_subscribers')->search({
'username' => $result->caller,
})->first();
if ($prov_src_sub) {
$src_sub = $prov_src_sub->voip_subscriber;
}
}
my $dst_sub = $result->callee_subscriber // undef; #undef, if not local, or if callee is username
#try finding it:
unless ($dst_sub) {
my $dst_src_sub = $c->model('DB')->resultset('provisioning_voip_subscribers')->search({
'username' => $result->callee,
})->first();
if ($prov_dst_sub) {
$dst_sub = $prov_dst_sub->voip_subscriber;
}
}
# either src or dst must be local.
my $prov_src_sub = $src_sub
? $src_sub->provisioning_voip_subscriber
: $subscriber;
: undef;
#: $prov_sub;
my $prov_dst_sub = $dst_sub
? $dst_sub->provisioning_voip_subscriber
: $subscriber;
: undef;
#: $prov_sub;
my $src_rewrite = 1;
my $dst_rewrite = 1;
if ($src_sub && $dst_sub && $src_sub->contract_id == $dst_sub->contract_id) {
if ($prov_src_sub && $prov_src_sub->pbx_extension) {
$resource->{caller} = $prov_src_sub->pbx_extension;
my $label = 'fax_journal id ' . $result->id . ' (sid = ' . $result->sid . ') ' . $dir;
$c->log->debug($label . ' number normalization: fax_journal sub username = ' . $prov_sub->username .
', caller = ' . $resource->{caller} . ', callee = ' . $resource->{callee} .
', prov_src_sub username = ' . ($prov_src_sub ? $prov_src_sub->username : '') . ', prov_dst_sub username = ' . ($prov_dst_sub ? $prov_dst_sub->username : ''));
if ($dir eq 'out') {
# outgoing fax_journal record: fax_journal item subscriber is the callER
if ($src_sub and not $dst_sub) {
$prov_dst_sub = $c->model('DB')->resultset('provisioning_voip_subscribers')->search({
'account_id' => $src_sub->contract_id,
'pbx_extension' => $resource->{callee},
})->first();
if ($prov_dst_sub) {
$dst_sub = $prov_dst_sub->voip_subscriber;
$c->log->debug($label . ' no destination, but found extension ' . $resource->{callee});
} else {
#try harder:
my $callee = $resource->{callee};
if (my $rt_callee = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c,
number => $callee,
subscriber => $src_sub // $subscriber,
direction => 'callee_in'
)) {
$callee = $rt_callee; #e164
$c->log->debug($label . ' no destination, normalized ' . $resource->{callee} . ' to ' . $callee);
my $prov_dst_alias = $c->model('DB')->resultset('voip_dbaliases')->search({
'username' => $callee,
})->first();
if ($prov_dst_alias) {
$c->log->debug($label . ' no destination, alias found');
$prov_dst_sub = $prov_dst_alias->subscriber;
if ($prov_dst_sub) {
$dst_sub = $prov_dst_sub->voip_subscriber;
}
} else {
$c->log->debug($label . ' no destination, no alias found');
}
} else {
$c->log->debug($label . ' no destination, rewrite not matched');
}
}
}
# caller field:
if ($prov_sub->pbx_extension) {
# always set the caller to the extension, if available (pbx)
$resource->{caller} = $prov_sub->pbx_extension;
$src_rewrite = 0;
$c->log->debug($label . ' CALLER number normalization: subscriber has pbx_extension' .
', applying ' . $resource->{caller});
} elsif ($prov_sub->is_pbx_pilot) {
# if no extension, it can be the pbx pilot.
if ($resource->{caller} eq $prov_sub->username) {
# use its primary number, if the caller field shows a username.
$resource->{caller} = _get_alias_or_primary_number($c,$subscriber);
$src_rewrite = 0;
$c->log->debug($label . ' CALLER number normalization: subscriber is pbx pilot' .
' and caller shows the username, applying primary number ' . $resource->{caller});
} else {
$c->log->debug($label . ' CALLER number normalization: subscriber is pbx pilot' .
' but caller does not show the username, no override');
}
} else {
# otherwise its some other local subscriber.
if ($resource->{caller} eq $prov_sub->username) {
# use its primary number, if the caller field shows a username.
$resource->{caller} = _get_alias_or_primary_number($c,$subscriber);
$src_rewrite = 0;
$c->log->debug($label . ' CALLER number normalization: subscriber is other local susbcriber' .
' and caller shows the username, applying primary number ' . $resource->{caller});
} else {
$c->log->debug($label . ' CALLER number normalization: subscriber is other local susbcriber' .
' but caller does not show the username, no override');
}
}
if ($prov_dst_sub && $prov_dst_sub->pbx_extension) {
$resource->{callee} = $prov_dst_sub->pbx_extension;
$dst_rewrite = 0;
# callee field:
if ($src_sub && $dst_sub && $src_sub->contract_id == $dst_sub->contract_id) {
# for pbx, src and dst are local and belong to same contract
if ($prov_dst_sub->pbx_extension) {
# always set the callee to the extension, if available
$resource->{callee} = $prov_dst_sub->pbx_extension;
$dst_rewrite = 0;
$c->log->debug($label . ' CALLEE number normalization: intra customer and destination has pbx_extension' .
', applying ' . $resource->{callee});
} elsif ($prov_dst_sub->is_pbx_pilot) {
# if no extension, it can be the pbx pilot.
if ($resource->{callee} eq $prov_dst_sub->username) {
# use its primary number, if the callee field shows a username.
$resource->{callee} = _get_alias_or_primary_number($c,$dst_sub);
$dst_rewrite = 0;
$c->log->debug($label . ' CALLEE number normalization: intra customer and destination is pbx pilot' .
' and callee shows the username, applying primary number ' . $resource->{callee});
} else {
$c->log->debug($label . ' CALLEE number normalization: intra customer and destination is pbx pilot' .
' but callee does not show the username, no override');
}
} else {
# otherwise its a non-pbx intra customer fax.
if ($resource->{callee} eq $prov_dst_sub->username) {
# use its primary number, if the callee field shows a username.
$resource->{callee} = _get_alias_or_primary_number($c,$dst_sub);
$dst_rewrite = 0;
$c->log->debug($label . ' CALLEE number normalization: non-pbx intra customer destination' .
' and callee shows the username, applying primary number ' . $resource->{callee});
} else {
$c->log->debug($label . ' CALLEE number normalization: non-pbx intra customer destination' .
' but callee does not show the username, no override');
}
}
} else {
# fax to other subscriber, maybe not local.
if ($dst_sub && $prov_dst_sub && $resource->{callee} eq $prov_dst_sub->username) {
# use its primary number, if the callee field shows a username.
$resource->{callee} = _get_alias_or_primary_number($c,$dst_sub);
$dst_rewrite = 0;
$c->log->debug($label . ' CALLEE number normalization: destination is other local susbcriber ' .
' and callee shows the username, applying primary number ' . $resource->{callee});
} else {
$c->log->debug($label . ' CALLEE number normalization: destination is other susbcriber ' .
' and callee does not show the username, no override');
}
}
if ($dst_rewrite) {
if (my $rt_callee = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c,
number => $resource->{callee},
subscriber => $src_sub // $subscriber,
direction => 'callee_in'
)) {
$resource->{callee} = $rt_callee;
$c->log->debug($label . ' number normalization: callee rewrite applied - ' . $resource->{callee});
#now we should have strict e164.
if ($rt_callee = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c,
number => $resource->{callee},
subscriber => $src_sub // $subscriber,
#avp_caller_subscriber => $dst_sub,
direction => 'caller_out'
)) {
$resource->{callee} = $rt_callee;
$c->log->debug($label . ' 2nd number normalization: caller rewrite applied to callee - ' . $resource->{callee});
} else {
$c->log->debug($label . ' 2nd number normalization: caller rewrite ignored to callee');
}
} else {
$c->log->debug($label . ' number normalization: callee rewrite ignored');
}
} else {
$c->log->debug($label . ' number normalization: callee rewrite skipped');
}
} else {
# incoming fax_journal record: fax_journal item subscriber is the callEE
# callee field:
if ($prov_sub->pbx_extension) {
if ($dir eq 'out') {
$resource->{caller} = $prov_sub->pbx_extension;
$src_rewrite = 0;
# always set the callee to the extension, if available (pbx)
$resource->{callee} = $prov_sub->pbx_extension;
$dst_rewrite = 0;
$c->log->debug($label . ' CALLEE number normalization: subscriber has pbx_extension' .
', applying ' . $resource->{callee});
} elsif ($prov_sub->is_pbx_pilot) {
# if no extension, it can be the pbx pilot.
if ($resource->{callee} eq $prov_sub->username) {
# use its primary number, if the callee field shows a username.
$resource->{callee} = _get_alias_or_primary_number($c,$subscriber);
$dst_rewrite = 0;
$c->log->debug($label . ' CALLEE number normalization: subscriber is pbx pilot' .
' and callee shows the username, applying primary number ' . $resource->{callee});
} else {
$resource->{callee} = $prov_sub->pbx_extension;
$c->log->debug($label . ' CALLEE number normalization: subscriber is pbx pilot' .
' but callee does not show the username, no override');
}
} else {
# otherwise its some other local subscriber.
if ($resource->{callee} eq $prov_sub->username) {
# use its primary number, if the caller field shows a username.
$resource->{callee} = _get_alias_or_primary_number($c,$subscriber);
$dst_rewrite = 0;
$c->log->debug($label . ' CALLEE number normalization: subscriber is other local susbcriber' .
' and callee shows the username, applying primary number ' . $resource->{callee});
} else {
$c->log->debug($label . ' CALLEE number normalization: subscriber is other local susbcriber' .
' but callee does not show the username, no override');
}
}
}
if ($src_rewrite) {
if (my $rt_caller = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c,
number => $resource->{caller},
subscriber => $src_sub // $subscriber,
direction => 'caller_out'
)) {
$resource->{caller} = $rt_caller;
# caller field:
if ($src_sub && $dst_sub && $src_sub->contract_id == $dst_sub->contract_id) {
# for pbx, src and dst are local and belong to same contract
if ($prov_src_sub->pbx_extension) {
# always set the caller to the extension, if available
$resource->{caller} = $prov_src_sub->pbx_extension;
$src_rewrite = 0;
$c->log->debug($label . ' CALLER number normalization: intra customer and source has pbx_extension' .
', applying ' . $resource->{caller});
} elsif ($prov_src_sub->is_pbx_pilot) {
# if no extension, it can be the pbx pilot.
if ($resource->{caller} eq $prov_src_sub->username) {
# use its primary number, if the caller field shows a username.
$resource->{caller} = _get_alias_or_primary_number($c,$src_sub);
$src_rewrite = 0;
$c->log->debug($label . ' CALLER number normalization: intra customer and source is pbx pilot' .
' and caller shows the username, applying primary number ' . $resource->{caller});
} else {
$c->log->debug($label . ' CALLER number normalization: intra customer and source is pbx pilot' .
' but caller does not show the username, no override');
}
#if ($src_rewrite) {
_apply_in_caller_rewrite($c,$resource,$dst_sub,$dst_sub,$label);
#}
} else {
# otherwise its a non-pbx intra customer fax.
if ($resource->{caller} eq $prov_src_sub->username) {
# use its primary number, if the caller field shows a username.
$resource->{caller} = _get_alias_or_primary_number($c,$src_sub);
$src_rewrite = 0;
$c->log->debug($label . ' CALLER number normalization: non-pbx intra customer source' .
' and caller shows the username, applying primary number ' . $resource->{caller});
} else {
$c->log->debug($label . ' CALLER number normalization: non-pbx intra customer source' .
' but caller does not show the username, no override');
}
#if ($src_rewrite) {
_apply_in_caller_rewrite($c,$resource,$dst_sub,$dst_sub,$label);
#}
}
} else {
# fax from other subscriber, maybe not local.
if ($src_sub && $prov_src_sub && $resource->{caller} eq $prov_src_sub->username) {
# use its primary number, if the caller field shows a username.
$resource->{caller} = _get_alias_or_primary_number($c,$src_sub);
$src_rewrite = 0;
$c->log->debug($label . ' CALLER number normalization: source is other local susbcriber ' .
' and caller shows the username, applying primary number ' . $resource->{caller});
} else {
$c->log->debug($label . ' CALLER number normalization: source is other susbcriber ' .
' and caller does not show the username, no override');
}
if ($dst_sub) {
_apply_in_caller_rewrite($c,$resource,$dst_sub,$dst_sub,$label);
}
}
}
return $resource;
}
sub _apply_in_caller_rewrite {
my ($c,$resource,$src_sub,$dst_sub,$label) = @_;
if (my $rt_caller = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c,
number => $resource->{caller},
subscriber => $src_sub,
avp_callee_subscriber => $dst_sub,
direction => 'caller_out'
)) {
$resource->{caller} = $rt_caller;
$c->log->debug($label . ' number normalization: caller rewrite applied - ' . $resource->{caller});
return 1;
} else {
$c->log->debug($label . ' number normalization: caller rewrite ignored');
return 0;
}
if ($dst_rewrite) {
if (my $rt_callee = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c,
number => $resource->{callee},
subscriber => $dst_sub // $subscriber,
direction => 'caller_out'
)) {
$resource->{callee} = $rt_callee;
}
sub _get_alias_or_primary_number {
my ($c,$subscriber) = @_;
my $prov_subs = $subscriber->provisioning_voip_subscriber;
if ($prov_subs) {
my $pref = $c->model('DB')->resultset('voip_usr_preferences')->search({
'attribute.attribute' => 'gpp0',
'subscriber_id' => $prov_subs->id,
},{
'join' => 'attribute',
})->first();
if ($pref and $pref->value) {
return $pref->value;
}
}
return $resource;
my $primary_number = $subscriber->primary_number;
return $primary_number->cc . ($primary_number->ac // '') . $primary_number->sn;
}
1;

42
lib/NGCP/Panel/Utils/Subscriber.pm
Unescape View File

@ -1299,6 +1299,8 @@ sub apply_rewrite {
my $c = $params{c};
my $subscriber = $params{subscriber};
my $avp_caller_subscriber = $params{avp_caller_subscriber} // $subscriber;
my $avp_callee_subscriber = $params{avp_callee_subscriber} // $subscriber;
my $callee = $params{number};
my $dir = $params{direction};
my $rws_id = $params{rws_id}; # override rewrite rule set
@ -1378,13 +1380,23 @@ sub apply_rewrite {
for my $field($match, $replace) {
#print ">>>>>>>>>>> normalizing $field\n";
my @avps = ();
@avps = ($field =~ /\$\(?avp\(s:calle(?:r|e)_([^\)]+)\)/g);
@avps = ($field =~ /\$\(?avp\(s:([^\)]+)\)/g);
@avps = keys %{{ map { $_ => 1 } @avps }};
for my $avp(@avps) {
if(!exists $cache->{$avp}) {
if($avp eq "cloud_pbx_account_cli_list") {
if($avp eq "caller_cloud_pbx_account_cli_list") {
$cache->{$avp} = [];
foreach my $sub($subscriber->contract->voip_subscribers->all) {
foreach my $sub($avp_caller_subscriber->contract->voip_subscribers->all) {
foreach my $num($sub->voip_numbers->search({ status => 'active' })->all) {
my $v = $num->cc . ($num->ac // '') . $num->sn;
unless(grep { $v eq $_ } @{ $cache->{$avp} }) {
push @{ $cache->{$avp} }, $v;
}
}
}
} elsif($avp eq "callee_cloud_pbx_account_cli_list") {
$cache->{$avp} = [];
foreach my $sub($avp_callee_subscriber->contract->voip_subscribers->all) {
foreach my $num($sub->voip_numbers->search({ status => 'active' })->all) {
my $v = $num->cc . ($num->ac // '') . $num->sn;
unless(grep { $v eq $_ } @{ $cache->{$avp} }) {
@ -1393,21 +1405,29 @@ sub apply_rewrite {
}
}
} else {
my $avp_attr = $avp;
$avp_attr =~ s/^calle(?:r|e)_//;
my $pref_rs = undef;
if ($sub_type eq 'provisioning') {
my $subs = $subscriber;
if ($avp =~ /^caller_/) {
$subs = $avp_caller_subscriber;
} elsif ($avp =~ /^callee_/) {
$subs = $avp_callee_subscriber;
}
$pref_rs = NGCP::Panel::Utils::Preferences::get_usr_preference_rs(
c => $c, attribute => $avp,
prov_subscriber => $subscriber->provisioning_voip_subscriber,
c => $c, attribute => $avp_attr,
prov_subscriber => $subs->provisioning_voip_subscriber,
);
unless($pref_rs && $pref_rs->count) {
$pref_rs = NGCP::Panel::Utils::Preferences::get_dom_preference_rs(
c => $c, attribute => $avp,
prov_domain => $subscriber->provisioning_voip_subscriber->domain,
c => $c, attribute => $avp_attr,
prov_domain => $subs->provisioning_voip_subscriber->domain,
);
}
} elsif ($sub_type eq 'billing') {
$pref_rs = NGCP::Panel::Utils::Preferences::get_dom_preference_rs(
c => $c, attribute => $avp,
c => $c, attribute => $avp_attr,
prov_domain => $subscriber->domain->provisioning_voip_domain,
);
}
@ -1425,14 +1445,14 @@ sub apply_rewrite {
$orig = shift @{ $orig } if(ref $orig eq "ARRAY");
foreach my $v(@{ $val }) {
my $tmporig = $orig;
$tmporig =~ s/\$avp\(s:calle(?:r|e)_$avp\)/$v/g;
$tmporig =~ s/\$\(avp\(s:calle(?:r|e)_$avp\)\[\+\]\)/$v/g;
$tmporig =~ s/\$avp\(s:$avp\)/$v/g;
$tmporig =~ s/\$\(avp\(s:$avp\)\[\+\]\)/$v/g;
push @{ $field }, $tmporig;
}
} else {
my $orig = $field;
$orig = shift @{ $orig } if(ref $orig eq "ARRAY");
$orig =~ s/\$avp\(s:calle(?:r|e)_$avp\)/$val/g;
$orig =~ s/\$avp\(s:$avp\)/$val/g;
$field = [] unless(ref $field eq "ARRAY");
push @{ $field }, $orig;
}

Write Preview
Loading…
Cancel
Save