diff options
| author | Max <msuraev@sysmocom.de> | 2016-07-04 11:09:07 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2016-07-11 19:18:17 +0000 |
| commit | 176b62a80c0170f1b9a1578d0b16c3ef27cf1a8f (patch) | |
| tree | 657b3b698ffff09be025a1c2bf4a64a32df93f8d | |
| parent | e6052c4cc756f7d3a5023a0ba57fe8d80783967c (diff) | |
SGSN: prevent starting with inconsistent config
Previously it was possible to start osmo-sgsn with "auth-policy remote"
but without "gsup remote-*" which resulted in broken setup: no MS could
perform GPRS ATTACH. Add consistency check to vty code to fix this.
Related: OS#1582
Change-Id: Ie4296e7d99d7833f7d828b0196435ea81097cf6e
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | openbsc/src/gprs/sgsn_vty.c | 17 | ||||
| -rw-r--r-- | openbsc/tests/vty_test_runner.py | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6a0362a49..e9a421205 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ openbsc (0.15.1) UNRELEASED; urgency=medium * Move forward toward a new release. + * Prevent SGSN starting with 'auth-policy remote' when no 'gsup remote-*' are configured. + Note: such configs are broken without extra workarounds anyway. -- Holger Hans Peter Freyther <holger@moiji-mobile.com> Tue, 24 May 2016 23:14:31 +0200 diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c index ac08bed65..e6dc68d95 100644 --- a/openbsc/src/gprs/sgsn_vty.c +++ b/openbsc/src/gprs/sgsn_vty.c @@ -210,9 +210,6 @@ static int config_write_sgsn(struct vty *vty) for (server = sgsn->ares_servers; server; server = server->next) vty_out(vty, " grx-dns-add %s%s", inet_ntoa(server->addr.addr4), VTY_NEWLINE); - vty_out(vty, " auth-policy %s%s", - get_value_string(sgsn_auth_pol_strs, g_cfg->auth_policy), - VTY_NEWLINE); if (g_cfg->cipher != GPRS_ALGO_GEA0) vty_out(vty, " encryption %s%s", get_value_string(gprs_cipher_names, g_cfg->cipher), @@ -223,6 +220,9 @@ static int config_write_sgsn(struct vty *vty) if (g_cfg->gsup_server_port) vty_out(vty, " gsup remote-port %d%s", g_cfg->gsup_server_port, VTY_NEWLINE); + vty_out(vty, " auth-policy %s%s", + get_value_string(sgsn_auth_pol_strs, g_cfg->auth_policy), + VTY_NEWLINE); vty_out(vty, " gsup oap-id %d%s", (int)g_cfg->oap.client_id, VTY_NEWLINE); @@ -591,6 +591,17 @@ DEFUN(cfg_auth_policy, cfg_auth_policy_cmd, { int val = get_string_value(sgsn_auth_pol_strs, argv[0]); OSMO_ASSERT(val >= SGSN_AUTH_POLICY_OPEN && val <= SGSN_AUTH_POLICY_REMOTE); + if (val == SGSN_AUTH_POLICY_REMOTE) { + const char *err = "%% auth-policy remote requires"; + if (!g_cfg->gsup_server_addr.sin_addr.s_addr) { + vty_out(vty, "%s 'gsup remote-ip'%s", err, VTY_NEWLINE); + return CMD_WARNING; + } + if (!g_cfg->gsup_server_port) { + vty_out(vty, "%s 'gsup remote-port'%s", err, VTY_NEWLINE); + return CMD_WARNING; + } + } g_cfg->auth_policy = val; g_cfg->require_authentication = (val == SGSN_AUTH_POLICY_REMOTE); g_cfg->require_update_location = (val == SGSN_AUTH_POLICY_REMOTE); diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index 23939e84c..00eae70f2 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -1086,6 +1086,8 @@ class TestVTYSGSN(TestVTYGenericBSC): self.assertTrue(self.vty.verify('auth-policy closed', [''])) res = self.vty.command("show running-config") self.assert_(res.find('auth-policy closed') > 0) + self.assertTrue(self.vty.verify('gsup remote-ip 127.0.0.4', [''])) + self.assertTrue(self.vty.verify('gsup remote-port 2222', [''])) self.assertTrue(self.vty.verify('auth-policy remote', [''])) res = self.vty.command("show running-config") self.assert_(res.find('auth-policy remote') > 0) |