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

MT#59492 Use reserved IPs following RFC5737

Browse Source 
Usage of IP addresses like 1.2.3.4 is not recommended, as they
might point to actually used and non-reserved IPs.

Quoting from RFC 5737 AKA "IPv4 Address Blocks Reserved for
Documentation" (see https://datatracker.ietf.org/doc/html/rfc5737):

| The blocks 192.0.2.0/24 (TEST-NET-1), 198.51.100.0/24 (TEST-NET-2), and
| 203.0.113.0/24 (TEST-NET-3) are provided for use in documentation.

So use 203.0.113.0/24 instead.

Change-Id: I4b85120e1409af306c52693211bd86ea01ec19df
mr12.3
Michael Prokop 2 years ago
parent 9ba93e69a5
commit 3ccdaaa20f
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
Build.PL
Unescape View File

@ -39,7 +39,7 @@ A completely overhauled provisioning interface for the NGCP system.
./Build testcover
./Build test_api
./Build test_api --schema-base-dir=path/to/schema --server=https://1.2.3.4:1443
./Build test_api --schema-base-dir=path/to/schema --server=https://203.0.113.42:1443
=head2 Options
@ -100,4 +100,4 @@ Sipwise Development Team <support@sipwise.com>.
=head1 LICENSE
GPL-3+, Sipwise GmbH, Austria.
GPL-3+, Sipwise GmbH, Austria.

4
etc/ngcp_panel.conf
Unescape View File

@ -134,7 +134,7 @@ log4perl.appender.Default.layout.ConversionPattern=%d{ISO8601} [%p] [%F +%L] %m{
<sip>
path <sip:127.0.0.1:5062;lr>
lb_ext 1.2.3.4:5060
lb_ext 203.0.113.42:5060
</sip>
<speed_dial_vsc_presets>
@ -171,7 +171,7 @@ log4perl.appender.Default.layout.ConversionPattern=%d{ISO8601} [%p] [%F +%L] %m{
<callflow>
lb_int 127.0.0.1:5060
lb_ext 1.2.3.4:5060
lb_ext 203.0.113.42:5060
proxy 127.0.0.1:5062
sbc 127.0.0.1:5080
app 127.0.0.1:5070

6
sandbox/php_intercept-nusoap.t
Unescape View File

@ -26,7 +26,7 @@ $res = $client->call('create_interception',
'number' => '439991001',
'cc_required' => 0,
'iri_delivery' => array(
'host' => '1.2.3.4',
'host' => '203.0.113.42',
'port' => 1234,
),
)
@ -68,11 +68,11 @@ $res = $client->call('update_interception',
'data' => array(
'cc_required' => 1,
'iri_delivery' => array(
'host' => '1.2.3.5',
'host' => '203.0.113.43',
'port' => 1234,
),
'cc_delivery' => array(
'host' => '1.2.3.6',
'host' => '203.0.113.44',
'port' => 1236,
)
)

4
t/api-rest/Dockerfile
Unescape View File

@ -5,7 +5,7 @@ FROM docker.mgm.sipwise.com/sipwise-bookworm:latest
# is updated with the current date. It will force refresh of all
# of the base images and things like `apt-get update` won't be using
# old cached versions when the Dockerfile is built.
ENV REFRESHED_AT 2023-06-26
ENV REFRESHED_AT 2024-03-07
# files that get-code generates
COPY t/api-rest/sources.list.d/builddeps.list /etc/apt/sources.list.d/
@ -43,7 +43,7 @@ RUN apt-get --assume-yes -f install
RUN apt-get clean
RUN echo "cd /code && ./t/api-rest/testrunner 1.2.3.4" > /home/testuser/.bash_history
RUN echo "cd /code && ./t/api-rest/testrunner 203.0.113.42" > /home/testuser/.bash_history
RUN echo "su - testuser" > /root/.bash_history
WORKDIR /home/testuser

4
t/api-rest/api-trustedsources.t
Unescape View File

@ -20,7 +20,7 @@ $fake_data->set_data_from_script({
data => {
subscriber_id => sub { return shift->get_id('subscribers',@_); },
protocol => 'UDP',
src_ip => '1.2.3.4',
src_ip => '203.0.113.42',
from_pattern => '^sip:test@example.org',
},
query => ['subscriber_id'],
@ -32,7 +32,7 @@ $test_machine->DATA_ITEM_STORE($fake_data->process('trustedsources'));
$test_machine->form_data_item( );
# create 3 new field pbx devices from DATA_ITEM
$test_machine->check_create_correct( 3, sub{ $_[0]->{src_ip} = sprintf('1.2.3.%d', $_[1]->{i}); } );
$test_machine->check_create_correct( 3, sub{ $_[0]->{src_ip} = sprintf('203.0.113.%d', $_[1]->{i}); } );
$test_machine->check_get2put();
$test_machine->check_bundle();
$test_machine->clear_test_data_all();

4
t/api-rest2/Dockerfile
Unescape View File

@ -5,7 +5,7 @@ FROM docker.mgm.sipwise.com/sipwise-bookworm:latest
# is updated with the current date. It will force refresh of all
# of the base images and things like `apt-get update` won't be using
# old cached versions when the Dockerfile is built.
ENV REFRESHED_AT 2023-06-26
ENV REFRESHED_AT 2024-03-07
# files that get-code generates
COPY t/api-rest/sources.list.d/builddeps.list /etc/apt/sources.list.d/
@ -24,7 +24,7 @@ RUN apt-get update && \
libyaml-libyaml-perl \
&& echo "Done"
RUN echo "cd /code && ./t/api-rest2/testrunner 1.2.3.4" > /root/.bash_history
RUN echo "cd /code && ./t/api-rest2/testrunner 203.0.113.42" > /root/.bash_history
WORKDIR /code/

8
t/api-rest2/TrustedSources.yaml
Unescape View File

@ -141,7 +141,7 @@
content:
subscriber_id: ${subscriber_id}
protocol: 'UDP'
src_ip: '1.2.3.4'
src_ip: '203.0.113.42'
from_pattern: '^sip:test@example.org'
retain:
trustedsources_path1: header.location
@ -160,7 +160,7 @@
content:
subscriber_id: ${subscriber_id}
protocol: 'UDP'
src_ip: '1.2.3.5'
src_ip: '203.0.113.43'
from_pattern: '^sip:test@example.org'
retain:
trustedsources_path2: header.location
@ -179,7 +179,7 @@
content:
subscriber_id: ${subscriber_id}
protocol: 'UDP'
src_ip: '1.2.3.6'
src_ip: '203.0.113.44'
from_pattern: '^sip:test@example.org'
retain:
trustedsources_path3: header.location
@ -297,4 +297,4 @@
path: '/${trustedsources_path3}'
conditions:
is:
code: 204
code: 204

4
t/selenium/Dockerfile
Unescape View File

@ -5,7 +5,7 @@ FROM docker.mgm.sipwise.com/sipwise-bookworm:latest
# is updated with the current date. It will force refresh of all
# of the base images and things like `apt-get update` won't be using
# old cached versions when the Dockerfile is built.
ENV REFRESHED_AT 2023-07-05
ENV REFRESHED_AT 2024-03-07
RUN apt-get update
RUN apt-get install --assume-yes \
@ -56,7 +56,7 @@ RUN wget http://deb.sipwise.com/files/google-chrome-stable_114_amd64.deb && \
apt install -y ./google-chrome-stable_114_amd64.deb && \
rm -f google-chrome-stable_114_amd64.deb
RUN echo "cd /code && ./t/selenium/testrunner 1.2.3.4 /code/ tap" >/home/selenium/.bash_history
RUN echo "cd /code && ./t/selenium/testrunner 203.0.113.42 /code/ tap" >/home/selenium/.bash_history
RUN echo "su - selenium" >/root/.bash_history
EXPOSE 5999

4
t/selenium/testrunner
Unescape View File

@ -15,8 +15,8 @@ if [ -z "${1:-}" ] ; then
echo
echo "Usage examples:
$0 1.2.3.4
$0 1.2.3.4 /code/ tap"
$0 203.0.113.42
$0 203.0.113.42 /code/ tap"
exit 1
fi

Write Preview
Loading…
Cancel
Save