summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhagbard <vyosdev@derith.de>2019-12-16 08:09:00 -0800
committerhagbard <vyosdev@derith.de>2019-12-16 08:55:00 -0800
commitb55b68f6246329468b4ab3450e127d5bab683bff (patch)
tree0d6210ec071e68943b1ab125a762887364ab30fe
parente10aea428e1f807f24052d170e9d55b79d0ba535 (diff)
downloadvyos-1x-b55b68f6246329468b4ab3450e127d5bab683bff.tar.gz
vyos-1x-b55b68f6246329468b4ab3450e127d5bab683bff.zip
service-pppoe: T1878: option pppoe single-session implementation
-rw-r--r--interface-definitions/service-pppoe.xml.in20
-rwxr-xr-xsrc/conf_mode/service-pppoe.py713
2 files changed, 403 insertions, 330 deletions
diff --git a/interface-definitions/service-pppoe.xml.in b/interface-definitions/service-pppoe.xml.in
index e73493309..4951f656b 100644
--- a/interface-definitions/service-pppoe.xml.in
+++ b/interface-definitions/service-pppoe.xml.in
@@ -30,6 +30,26 @@
<constraintErrorMessage>access-concentrator name limited to alphanumerical characters only (max. 100)</constraintErrorMessage>
</properties>
</leafNode>
+ <leafNode name="session-control">
+ <properties>
+ <help>control sessions count</help>
+ <constraint>
+ <regex>(deny|disable)</regex>
+ </constraint>
+ <constraintErrorMessage>Invalid value</constraintErrorMessage>
+ <valueHelp>
+ <format>disable</format>
+ <description>Disables session control</description>
+ </valueHelp>
+ <valueHelp>
+ <format>deny</format>
+ <description>Deny second session authorization</description>
+ </valueHelp>
+ <completionHelp>
+ <list>deny disable</list>
+ </completionHelp>
+ </properties>
+ </leafNode>
<node name="authentication">
<properties>
<help>Authentication for remote access PPPoE Server</help>
diff --git a/src/conf_mode/service-pppoe.py b/src/conf_mode/service-pppoe.py
index 6aec9be98..b92b7ab17 100755
--- a/src/conf_mode/service-pppoe.py
+++ b/src/conf_mode/service-pppoe.py
@@ -32,15 +32,16 @@ pidfile = r'/var/run/accel_pppoe.pid'
pppoe_cnf_dir = r'/etc/accel-ppp/pppoe'
chap_secrets = pppoe_cnf_dir + '/chap-secrets'
pppoe_conf = pppoe_cnf_dir + '/pppoe.config'
-# accel-pppd -d -c /etc/accel-ppp/pppoe/pppoe.config -p /var/run/accel_pppoe.pid
+# accel-pppd -d -c /etc/accel-ppp/pppoe/pppoe.config -p
+# /var/run/accel_pppoe.pid
-### config path creation
+# config path creation
if not os.path.exists(pppoe_cnf_dir):
- os.makedirs(pppoe_cnf_dir)
- sl.syslog(sl.LOG_NOTICE, pppoe_cnf_dir + " created")
+ os.makedirs(pppoe_cnf_dir)
+ sl.syslog(sl.LOG_NOTICE, pppoe_cnf_dir + " created")
pppoe_config = '''
-### generated by accel_pppoe.py ###
+### generated by accel_pppoe.py ###
[modules]
log_syslog
pppoe
@@ -182,7 +183,9 @@ vendor={{authentication['radiusopt']['shaper']['vendor']}}
[ppp]
verbose=1
check-ip=1
-single-session=replace
+{% if not sesscrtl == 'disable' %}
+single-session={{sesscrtl}}
+{% endif -%}
{% if ppp_options['ccp'] %}
ccp=1
{% endif %}
@@ -264,7 +267,7 @@ timeout={{limits['timeout']}}
tcp=127.0.0.1:2001
'''
-### pppoe chap secrets
+# pppoe chap secrets
chap_secrets_conf = '''
# username server password acceptable local IP addresses shaper
{% for user in authentication['local-users'] %}
@@ -278,351 +281,401 @@ chap_secrets_conf = '''
{% endif %}
{% endfor %}
'''
-###
+#
# inline helper functions
-###
+#
# depending on hw and threads, daemon needs a little to start
# if it takes longer than 100 * 0.5 secs, exception is being raised
-# not sure if that's the best way to check it, but it worked so far quite well
-###
+# not sure if that's the best way to check it, but it worked so far quite well
+#
+
+
def chk_con():
- cnt = 0
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- while True:
- try:
- s.connect(("127.0.0.1", 2001))
- break
- except ConnectionRefusedError:
- time.sleep(0.5)
- cnt +=1
- if cnt == 100:
- raise("failed to start pppoe server")
- break
-
-### chap_secrets file if auth mode local
+ cnt = 0
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ while True:
+ try:
+ s.connect(("127.0.0.1", 2001))
+ break
+ except ConnectionRefusedError:
+ time.sleep(0.5)
+ cnt += 1
+ if cnt == 100:
+ raise("failed to start pppoe server")
+ break
+
+# chap_secrets file if auth mode local
+
+
def write_chap_secrets(c):
- tmpl = jinja2.Template(chap_secrets_conf, trim_blocks=True)
- chap_secrets_txt = tmpl.render(c)
- old_umask = os.umask(0o077)
- open(chap_secrets,'w').write(chap_secrets_txt)
- os.umask(old_umask)
- sl.syslog(sl.LOG_NOTICE, chap_secrets + ' written')
+ tmpl = jinja2.Template(chap_secrets_conf, trim_blocks=True)
+ chap_secrets_txt = tmpl.render(c)
+ old_umask = os.umask(0o077)
+ open(chap_secrets, 'w').write(chap_secrets_txt)
+ os.umask(old_umask)
+ sl.syslog(sl.LOG_NOTICE, chap_secrets + ' written')
+
def accel_cmd(cmd=''):
- if not cmd:
- return None
- try:
- ret = subprocess.check_output(['/usr/bin/accel-cmd',cmd]).decode().strip()
- return ret
- except:
- return 1
+ if not cmd:
+ return None
+ try:
+ ret = subprocess.check_output(
+ ['/usr/bin/accel-cmd', cmd]).decode().strip()
+ return ret
+ except:
+ return 1
-#### check ig local-ip is in client pool subnet
+# check ig local-ip is in client pool subnet
-###
+#
# inline helper functions end
-###
+#
def get_config():
- c = Config()
- if not c.exists('service pppoe-server'):
- return None
-
- config_data = {
- 'concentrator' : 'vyos-ac',
- 'authentication' : {
- 'local-users' : {
+ c = Config()
+ if not c.exists('service pppoe-server'):
+ return None
+
+ config_data = {
+ 'concentrator': 'vyos-ac',
+ 'authentication': {
+ 'local-users': {
+ },
+ 'mode': 'local',
+ 'radiussrv': {},
+ 'radiusopt': {}
},
- 'mode' : 'local',
- 'radiussrv' : {},
- 'radiusopt' : {}
- },
- 'client_ip_pool' : '',
- 'client_ip_subnets' : [],
- 'client_ipv6_pool' : {},
- 'interface' : {},
- 'ppp_gw' : '',
- 'svc_name' : '',
- 'dns' : [],
- 'dnsv6' : [],
- 'wins' : [],
- 'mtu' : '1492',
- 'ppp_options' : {},
- 'limits' : {},
- 'snmp' : 'disable'
- }
-
- c.set_level('service pppoe-server')
- ### general options
- if c.exists('access-concentrator'):
- config_data['concentrator'] = c.return_value('access-concentrator')
- if c.exists('service-name'):
- config_data['svc_name'] = c.return_value('service-name')
- if c.exists('interface'):
- for intfc in c.list_nodes('interface'):
- config_data['interface'][intfc] = {'vlans' : []}
- if c.exists('interface ' + intfc + ' vlan-id'):
- config_data['interface'][intfc]['vlans'] += c.return_values('interface ' + intfc + ' vlan-id')
- if c.exists('interface ' + intfc + ' vlan-range'):
- config_data['interface'][intfc]['vlans'] +=c.return_values('interface ' + intfc + ' vlan-range')
- if c.exists('local-ip'):
- config_data['ppp_gw'] = c.return_value('local-ip')
- if c.exists('dns-servers'):
- if c.return_value('dns-servers server-1'):
- config_data['dns'].append(c.return_value('dns-servers server-1'))
- if c.return_value('dns-servers server-2'):
- config_data['dns'].append(c.return_value('dns-servers server-2'))
- if c.exists('dnsv6-servers'):
- if c.return_value('dnsv6-servers server-1'):
- config_data['dnsv6'].append(c.return_value('dnsv6-servers server-1'))
- if c.return_value('dnsv6-servers server-2'):
- config_data['dnsv6'].append(c.return_value('dnsv6-servers server-2'))
- if c.return_value('dnsv6-servers server-3'):
- config_data['dnsv6'].append(c.return_value('dnsv6-servers server-3'))
- if c.exists('wins-servers'):
- if c.return_value('wins-servers server-1'):
- config_data['wins'].append(c.return_value('wins-servers server-1'))
- if c.return_value('wins-servers server-2'):
- config_data['wins'].append(c.return_value('wins-servers server-2'))
- if c.exists('client-ip-pool'):
- if c.exists('client-ip-pool start'):
- config_data['client_ip_pool'] = c.return_value('client-ip-pool start')
- if c.exists('client-ip-pool stop'):
- config_data['client_ip_pool'] += '-' + re.search('[0-9]+$', c.return_value('client-ip-pool stop')).group(0)
- else:
- raise ConfigError('client ip pool stop required')
- if c.exists('client-ip-pool subnet'):
- config_data['client_ip_subnets'] = c.return_values('client-ip-pool subnet')
- if c.exists('client-ipv6-pool prefix'):
- config_data['client_ipv6_pool']['prefix'] = c.return_values('client-ipv6-pool prefix')
- if c.exists('client-ipv6-pool delegate-prefix'):
- config_data['client_ipv6_pool']['delegate-prefix'] = c.return_values('client-ipv6-pool delegate-prefix')
- if c.exists('limits'):
- if c.exists('limits burst'):
- config_data['limits']['burst'] = str(c.return_value('limits burst'))
- if c.exists('limits timeout'):
- config_data['limits']['timeout'] = str(c.return_value('limits timeout'))
- if c.exists('limits connection-limit'):
- config_data['limits']['conn-limit'] = str(c.return_value('limits connection-limit'))
- if c.exists('snmp'):
- config_data['snmp'] = 'enable'
- if c.exists('snmp master-agent'):
- config_data['snmp'] = 'enable-ma'
-
- #### authentication mode local
- if not c.exists('authentication mode'):
- raise ConfigError('pppoe-server authentication mode required')
-
- if c.exists('authentication mode local'):
- if c.exists('authentication local-users username'):
- for usr in c.list_nodes('authentication local-users username'):
- config_data['authentication']['local-users'].update(
- {
- usr : {
- 'passwd' : None,
- 'state' : 'enabled',
- 'ip' : '*',
- 'upload' : None,
- 'download' : None
- }
- }
- )
- if c.exists('authentication local-users username ' + usr + ' password'):
- config_data['authentication']['local-users'][usr]['passwd'] = c.return_value('authentication local-users username ' + usr + ' password')
- if c.exists('authentication local-users username ' + usr + ' disable'):
- config_data['authentication']['local-users'][usr]['state'] = 'disable'
- if c.exists('authentication local-users username ' + usr + ' static-ip'):
- config_data['authentication']['local-users'][usr]['ip'] = c.return_value('authentication local-users username ' + usr + ' static-ip')
- if c.exists('authentication local-users username ' + usr + ' rate-limit download'):
- config_data['authentication']['local-users'][usr]['download'] = c.return_value('authentication local-users username ' + usr + ' rate-limit download')
- if c.exists('authentication local-users username ' + usr + ' rate-limit upload'):
- config_data['authentication']['local-users'][usr]['upload'] = c.return_value('authentication local-users username ' + usr + ' rate-limit upload')
-
- ### authentication mode radius servers and settings
-
- if c.exists('authentication mode radius'):
- config_data['authentication']['mode'] = 'radius'
- rsrvs = c.list_nodes('authentication radius-server')
- for rsrv in rsrvs:
- if c.return_value('authentication radius-server ' + rsrv + ' fail-time') == None:
- ftime = '0'
- else:
- ftime = str(c.return_value('authentication radius-server ' + rsrv + ' fail-time'))
- if c.return_value('authentication radius-server ' + rsrv + ' req-limit') == None:
- reql = '0'
- else:
- reql = str(c.return_value('authentication radius-server ' + rsrv + ' req-limit'))
- config_data['authentication']['radiussrv'].update(
- {
- rsrv : {
- 'secret' : c.return_value('authentication radius-server ' + rsrv + ' secret'),
- 'fail-time' : ftime,
- 'req-limit' : reql
- }
- }
- )
-
- #### advanced radius-setting
- if c.exists('authentication radius-settings'):
- if c.exists('authentication radius-settings acct-timeout'):
- config_data['authentication']['radiusopt']['acct-timeout'] = c.return_value('authentication radius-settings acct-timeout')
- if c.exists('authentication radius-settings max-try'):
- config_data['authentication']['radiusopt']['max-try'] = c.return_value('authentication radius-settings max-try')
- if c.exists('authentication radius-settings timeout'):
- config_data['authentication']['radiusopt']['timeout'] = c.return_value('authentication radius-settings timeout')
- if c.exists('authentication radius-settings nas-identifier'):
- config_data['authentication']['radiusopt']['nas-id'] = c.return_value('authentication radius-settings nas-identifier')
- if c.exists('authentication radius-settings nas-ip-address'):
- config_data['authentication']['radiusopt']['nas-ip'] = c.return_value('authentication radius-settings nas-ip-address')
- if c.exists('authentication radius-settings dae-server'):
- config_data['authentication']['radiusopt'].update(
- {
- 'dae-srv' : {
- 'ip-addr' : c.return_value('authentication radius-settings dae-server ip-address'),
- 'port' : c.return_value('authentication radius-settings dae-server port'),
- 'secret' : str(c.return_value('authentication radius-settings dae-server secret'))
- }
- }
- )
- #### filter-id is the internal accel default if attribute is empty
- #### set here as default for visibility which may change in the future
- if c.exists('authentication radius-settings rate-limit enable'):
- if not c.exists('authentication radius-settings rate-limit attribute'):
- config_data['authentication']['radiusopt']['shaper'] = {
- 'attr' : 'Filter-Id'
- }
- else:
- config_data['authentication']['radiusopt']['shaper'] = {
- 'attr' : c.return_value('authentication radius-settings rate-limit attribute')
- }
- if c.exists('authentication radius-settings rate-limit vendor'):
- config_data['authentication']['radiusopt']['shaper']['vendor'] = c.return_value('authentication radius-settings rate-limit vendor')
-
- if c.exists('mtu'):
- config_data['mtu'] = c.return_value('mtu')
-
- ### ppp_options
- ppp_options = {}
- if c.exists('ppp-options'):
- if c.exists('ppp-options ccp'):
- ppp_options['ccp'] = c.return_value('ppp-options ccp')
- if c.exists('ppp-options min-mtu'):
- ppp_options['min-mtu'] = c.return_value('ppp-options min-mtu')
- if c.exists('ppp-options mru'):
- ppp_options['mru'] = c.return_value('ppp-options mru')
- if c.exists('ppp-options mppe deny'):
- ppp_options['mppe'] = 'deny'
- if c.exists('ppp-options mppe require'):
- ppp_options['mppe'] = 'requre'
- if c.exists('ppp-options mppe prefer'):
- ppp_options['mppe'] = 'prefer'
- if c.exists('ppp-options lcp-echo-failure'):
- ppp_options['lcp-echo-failure'] = c.return_value('ppp-options lcp-echo-failure')
- if c.exists('ppp-options lcp-echo-interval'):
- ppp_options['lcp-echo-interval'] = c.return_value('ppp-options lcp-echo-interval')
- if c.exists('ppp-options ipv4'):
- ppp_options['ipv4'] = c.return_value('ppp-options ipv4')
- if c.exists('ppp-options ipv6'):
- ppp_options['ipv6'] = c.return_value('ppp-options ipv6')
- if c.exists('ppp-options ipv6-accept-peer-intf-id'):
- ppp_options['ipv6-accept-peer-intf-id']= 1
- if c.exists('ppp-options ipv6-intf-id'):
- ppp_options['ipv6-intf-id'] = c.return_value('ppp-options ipv6-intf-id')
- if c.exists('ppp-options ipv6-peer-intf-id'):
- ppp_options['ipv6-peer-intf-id'] = c.return_value('ppp-options ipv6-peer-intf-id')
- if c.exists('ppp-options lcp-echo-timeout'):
- ppp_options['lcp-echo-timeout'] = c.return_value('ppp-options lcp-echo-timeout')
-
- if len(ppp_options) !=0:
- config_data['ppp_options'] = ppp_options
-
- return config_data
+ 'client_ip_pool': '',
+ 'client_ip_subnets': [],
+ 'client_ipv6_pool': {},
+ 'interface': {},
+ 'ppp_gw': '',
+ 'svc_name': '',
+ 'dns': [],
+ 'dnsv6': [],
+ 'wins': [],
+ 'mtu': '1492',
+ 'ppp_options': {},
+ 'limits': {},
+ 'snmp': 'disable',
+ 'sesscrtl': 'replace'
+ }
+
+ c.set_level('service pppoe-server')
+ # general options
+ if c.exists('access-concentrator'):
+ config_data['concentrator'] = c.return_value('access-concentrator')
+ if c.exists('service-name'):
+ config_data['svc_name'] = c.return_value('service-name')
+ if c.exists('interface'):
+ for intfc in c.list_nodes('interface'):
+ config_data['interface'][intfc] = {'vlans': []}
+ if c.exists('interface ' + intfc + ' vlan-id'):
+ config_data['interface'][intfc]['vlans'] += c.return_values(
+ 'interface ' + intfc + ' vlan-id')
+ if c.exists('interface ' + intfc + ' vlan-range'):
+ config_data['interface'][intfc]['vlans'] += c.return_values(
+ 'interface ' + intfc + ' vlan-range')
+ if c.exists('local-ip'):
+ config_data['ppp_gw'] = c.return_value('local-ip')
+ if c.exists('dns-servers'):
+ if c.return_value('dns-servers server-1'):
+ config_data['dns'].append(c.return_value('dns-servers server-1'))
+ if c.return_value('dns-servers server-2'):
+ config_data['dns'].append(c.return_value('dns-servers server-2'))
+ if c.exists('dnsv6-servers'):
+ if c.return_value('dnsv6-servers server-1'):
+ config_data['dnsv6'].append(
+ c.return_value('dnsv6-servers server-1'))
+ if c.return_value('dnsv6-servers server-2'):
+ config_data['dnsv6'].append(
+ c.return_value('dnsv6-servers server-2'))
+ if c.return_value('dnsv6-servers server-3'):
+ config_data['dnsv6'].append(
+ c.return_value('dnsv6-servers server-3'))
+ if c.exists('wins-servers'):
+ if c.return_value('wins-servers server-1'):
+ config_data['wins'].append(c.return_value('wins-servers server-1'))
+ if c.return_value('wins-servers server-2'):
+ config_data['wins'].append(c.return_value('wins-servers server-2'))
+ if c.exists('client-ip-pool'):
+ if c.exists('client-ip-pool start'):
+ config_data['client_ip_pool'] = c.return_value(
+ 'client-ip-pool start')
+ if c.exists('client-ip-pool stop'):
+ config_data['client_ip_pool'] += '-' + re.search(
+ '[0-9]+$', c.return_value('client-ip-pool stop')).group(0)
+ else:
+ raise ConfigError('client ip pool stop required')
+ if c.exists('client-ip-pool subnet'):
+ config_data['client_ip_subnets'] = c.return_values(
+ 'client-ip-pool subnet')
+ if c.exists('client-ipv6-pool prefix'):
+ config_data['client_ipv6_pool'][
+ 'prefix'] = c.return_values('client-ipv6-pool prefix')
+ if c.exists('client-ipv6-pool delegate-prefix'):
+ config_data['client_ipv6_pool']['delegate-prefix'] = c.return_values(
+ 'client-ipv6-pool delegate-prefix')
+ if c.exists('limits'):
+ if c.exists('limits burst'):
+ config_data['limits']['burst'] = str(
+ c.return_value('limits burst'))
+ if c.exists('limits timeout'):
+ config_data['limits']['timeout'] = str(
+ c.return_value('limits timeout'))
+ if c.exists('limits connection-limit'):
+ config_data['limits']['conn-limit'] = str(
+ c.return_value('limits connection-limit'))
+ if c.exists('snmp'):
+ config_data['snmp'] = 'enable'
+ if c.exists('snmp master-agent'):
+ config_data['snmp'] = 'enable-ma'
+
+ # authentication mode local
+ if not c.exists('authentication mode'):
+ raise ConfigError('pppoe-server authentication mode required')
+
+ if c.exists('authentication mode local'):
+ if c.exists('authentication local-users username'):
+ for usr in c.list_nodes('authentication local-users username'):
+ config_data['authentication']['local-users'].update(
+ {
+ usr: {
+ 'passwd': None,
+ 'state': 'enabled',
+ 'ip': '*',
+ 'upload': None,
+ 'download': None
+ }
+ }
+ )
+ if c.exists('authentication local-users username ' + usr + ' password'):
+ config_data['authentication']['local-users'][usr]['passwd'] = c.return_value(
+ 'authentication local-users username ' + usr + ' password')
+ if c.exists('authentication local-users username ' + usr + ' disable'):
+ config_data['authentication'][
+ 'local-users'][usr]['state'] = 'disable'
+ if c.exists('authentication local-users username ' + usr + ' static-ip'):
+ config_data['authentication']['local-users'][usr]['ip'] = c.return_value(
+ 'authentication local-users username ' + usr + ' static-ip')
+ if c.exists('authentication local-users username ' + usr + ' rate-limit download'):
+ config_data['authentication']['local-users'][usr]['download'] = c.return_value(
+ 'authentication local-users username ' + usr + ' rate-limit download')
+ if c.exists('authentication local-users username ' + usr + ' rate-limit upload'):
+ config_data['authentication']['local-users'][usr]['upload'] = c.return_value(
+ 'authentication local-users username ' + usr + ' rate-limit upload')
+
+ # authentication mode radius servers and settings
+
+ if c.exists('authentication mode radius'):
+ config_data['authentication']['mode'] = 'radius'
+ rsrvs = c.list_nodes('authentication radius-server')
+ for rsrv in rsrvs:
+ if c.return_value('authentication radius-server ' + rsrv + ' fail-time') == None:
+ ftime = '0'
+ else:
+ ftime = str(
+ c.return_value('authentication radius-server ' + rsrv + ' fail-time'))
+ if c.return_value('authentication radius-server ' + rsrv + ' req-limit') == None:
+ reql = '0'
+ else:
+ reql = str(
+ c.return_value('authentication radius-server ' + rsrv + ' req-limit'))
+ config_data['authentication']['radiussrv'].update(
+ {
+ rsrv: {
+ 'secret': c.return_value('authentication radius-server ' + rsrv + ' secret'),
+ 'fail-time': ftime,
+ 'req-limit': reql
+ }
+ }
+ )
+
+ # advanced radius-setting
+ if c.exists('authentication radius-settings'):
+ if c.exists('authentication radius-settings acct-timeout'):
+ config_data['authentication']['radiusopt']['acct-timeout'] = c.return_value(
+ 'authentication radius-settings acct-timeout')
+ if c.exists('authentication radius-settings max-try'):
+ config_data['authentication']['radiusopt'][
+ 'max-try'] = c.return_value('authentication radius-settings max-try')
+ if c.exists('authentication radius-settings timeout'):
+ config_data['authentication']['radiusopt'][
+ 'timeout'] = c.return_value('authentication radius-settings timeout')
+ if c.exists('authentication radius-settings nas-identifier'):
+ config_data['authentication']['radiusopt']['nas-id'] = c.return_value(
+ 'authentication radius-settings nas-identifier')
+ if c.exists('authentication radius-settings nas-ip-address'):
+ config_data['authentication']['radiusopt']['nas-ip'] = c.return_value(
+ 'authentication radius-settings nas-ip-address')
+ if c.exists('authentication radius-settings dae-server'):
+ config_data['authentication']['radiusopt'].update(
+ {
+ 'dae-srv': {
+ 'ip-addr': c.return_value('authentication radius-settings dae-server ip-address'),
+ 'port': c.return_value('authentication radius-settings dae-server port'),
+ 'secret': str(c.return_value('authentication radius-settings dae-server secret'))
+ }
+ }
+ )
+ # filter-id is the internal accel default if attribute is empty
+ # set here as default for visibility which may change in the future
+ if c.exists('authentication radius-settings rate-limit enable'):
+ if not c.exists('authentication radius-settings rate-limit attribute'):
+ config_data['authentication']['radiusopt']['shaper'] = {
+ 'attr': 'Filter-Id'
+ }
+ else:
+ config_data['authentication']['radiusopt']['shaper'] = {
+ 'attr': c.return_value('authentication radius-settings rate-limit attribute')
+ }
+ if c.exists('authentication radius-settings rate-limit vendor'):
+ config_data['authentication']['radiusopt']['shaper'][
+ 'vendor'] = c.return_value('authentication radius-settings rate-limit vendor')
+
+ if c.exists('mtu'):
+ config_data['mtu'] = c.return_value('mtu')
+
+ # ppp_options
+ ppp_options = {}
+ if c.exists('ppp-options'):
+ if c.exists('ppp-options ccp'):
+ ppp_options['ccp'] = c.return_value('ppp-options ccp')
+ if c.exists('ppp-options min-mtu'):
+ ppp_options['min-mtu'] = c.return_value('ppp-options min-mtu')
+ if c.exists('ppp-options mru'):
+ ppp_options['mru'] = c.return_value('ppp-options mru')
+ if c.exists('ppp-options mppe deny'):
+ ppp_options['mppe'] = 'deny'
+ if c.exists('ppp-options mppe require'):
+ ppp_options['mppe'] = 'requre'
+ if c.exists('ppp-options mppe prefer'):
+ ppp_options['mppe'] = 'prefer'
+ if c.exists('ppp-options lcp-echo-failure'):
+ ppp_options['lcp-echo-failure'] = c.return_value(
+ 'ppp-options lcp-echo-failure')
+ if c.exists('ppp-options lcp-echo-interval'):
+ ppp_options['lcp-echo-interval'] = c.return_value(
+ 'ppp-options lcp-echo-interval')
+ if c.exists('ppp-options ipv4'):
+ ppp_options['ipv4'] = c.return_value('ppp-options ipv4')
+ if c.exists('ppp-options ipv6'):
+ ppp_options['ipv6'] = c.return_value('ppp-options ipv6')
+ if c.exists('ppp-options ipv6-accept-peer-intf-id'):
+ ppp_options['ipv6-accept-peer-intf-id'] = 1
+ if c.exists('ppp-options ipv6-intf-id'):
+ ppp_options['ipv6-intf-id'] = c.return_value(
+ 'ppp-options ipv6-intf-id')
+ if c.exists('ppp-options ipv6-peer-intf-id'):
+ ppp_options['ipv6-peer-intf-id'] = c.return_value(
+ 'ppp-options ipv6-peer-intf-id')
+ if c.exists('ppp-options lcp-echo-timeout'):
+ ppp_options['lcp-echo-timeout'] = c.return_value(
+ 'ppp-options lcp-echo-timeout')
+
+ if len(ppp_options) != 0:
+ config_data['ppp_options'] = ppp_options
+
+ if c.exists(['session-control']):
+ config_data['sesscrtl'] = c.return_value(['session-control'])
+
+ return config_data
+
def verify(c):
- if c == None:
- return None
- ### vertify auth settings
- if c['authentication']['mode'] == 'local':
- if not c['authentication']['local-users']:
- raise ConfigError('pppoe-server authentication local-users required')
-
- for usr in c['authentication']['local-users']:
- if not c['authentication']['local-users'][usr]['passwd']:
- raise ConfigError('user ' + usr + ' requires a password')
- ### if up/download is set, check that both have a value
- if c['authentication']['local-users'][usr]['upload']:
- if not c['authentication']['local-users'][usr]['download']:
- raise ConfigError('user ' + usr + ' requires download speed value')
- if c['authentication']['local-users'][usr]['download']:
- if not c['authentication']['local-users'][usr]['upload']:
- raise ConfigError('user ' + usr + ' requires upload speed value')
-
- if c['authentication']['mode'] == 'radius':
- if len(c['authentication']['radiussrv']) == 0:
- raise ConfigError('radius server required')
- for rsrv in c['authentication']['radiussrv']:
- if c['authentication']['radiussrv'][rsrv]['secret'] == None:
- raise ConfigError('radius server ' + rsrv + ' needs a secret configured')
-
- ### local ippool and gateway settings config checks
-
- if c['client_ip_subnets'] or c['client_ip_pool']:
- if not c['ppp_gw']:
- raise ConfigError('pppoe-server local-ip required')
-
- if c['ppp_gw'] and not c['client_ip_subnets'] and not c['client_ip_pool']:
- print ("Warning: No pppoe client IPv4 pool defined")
+ if c == None:
+ return None
+ # vertify auth settings
+ if c['authentication']['mode'] == 'local':
+ if not c['authentication']['local-users']:
+ raise ConfigError(
+ 'pppoe-server authentication local-users required')
+
+ for usr in c['authentication']['local-users']:
+ if not c['authentication']['local-users'][usr]['passwd']:
+ raise ConfigError('user ' + usr + ' requires a password')
+ # if up/download is set, check that both have a value
+ if c['authentication']['local-users'][usr]['upload']:
+ if not c['authentication']['local-users'][usr]['download']:
+ raise ConfigError(
+ 'user ' + usr + ' requires download speed value')
+ if c['authentication']['local-users'][usr]['download']:
+ if not c['authentication']['local-users'][usr]['upload']:
+ raise ConfigError(
+ 'user ' + usr + ' requires upload speed value')
+
+ if c['authentication']['mode'] == 'radius':
+ if len(c['authentication']['radiussrv']) == 0:
+ raise ConfigError('radius server required')
+ for rsrv in c['authentication']['radiussrv']:
+ if c['authentication']['radiussrv'][rsrv]['secret'] == None:
+ raise ConfigError(
+ 'radius server ' + rsrv + ' needs a secret configured')
+
+ # local ippool and gateway settings config checks
+
+ if c['client_ip_subnets'] or c['client_ip_pool']:
+ if not c['ppp_gw']:
+ raise ConfigError('pppoe-server local-ip required')
+
+ if c['ppp_gw'] and not c['client_ip_subnets'] and not c['client_ip_pool']:
+ print ("Warning: No pppoe client IPv4 pool defined")
+
def generate(c):
- if c == None:
- return None
-
- ### accel-cmd reload doesn't work so any change results in a restart of the daemon
- try:
- if os.cpu_count() == 1:
- c['thread_cnt'] = 1
- else:
- c['thread_cnt'] = int(os.cpu_count()/2)
- except KeyError:
- if os.cpu_count() == 1:
- c['thread_cnt'] = 1
- else:
- c['thread_cnt'] = int(os.cpu_count()/2)
+ if c == None:
+ return None
+
+ # accel-cmd reload doesn't work so any change results in a restart of the
+ # daemon
+ try:
+ if os.cpu_count() == 1:
+ c['thread_cnt'] = 1
+ else:
+ c['thread_cnt'] = int(os.cpu_count() / 2)
+ except KeyError:
+ if os.cpu_count() == 1:
+ c['thread_cnt'] = 1
+ else:
+ c['thread_cnt'] = int(os.cpu_count() / 2)
- tmpl = jinja2.Template(pppoe_config, trim_blocks=True)
- config_text = tmpl.render(c)
- open(pppoe_conf,'w').write(config_text)
+ tmpl = jinja2.Template(pppoe_config, trim_blocks=True)
+ config_text = tmpl.render(c)
+ open(pppoe_conf, 'w').write(config_text)
- if c['authentication']['local-users']:
- write_chap_secrets(c)
+ if c['authentication']['local-users']:
+ write_chap_secrets(c)
+
+ return c
- return c
def apply(c):
- if c == None:
- if os.path.exists(pidfile):
- accel_cmd('shutdown hard')
- if os.path.exists(pidfile):
- os.remove(pidfile)
- return None
-
- if not os.path.exists(pidfile):
- ret = subprocess.call(['/usr/sbin/accel-pppd','-c',pppoe_conf,'-p',pidfile,'-d'])
- chk_con()
- if ret !=0 and os.path.exists(pidfile):
- os.remove(pidfile)
- raise ConfigError('accel-pppd failed to start')
- else:
- accel_cmd('restart')
- sl.syslog(sl.LOG_NOTICE, "reloading config via daemon restart")
+ if c == None:
+ if os.path.exists(pidfile):
+ accel_cmd('shutdown hard')
+ if os.path.exists(pidfile):
+ os.remove(pidfile)
+ return None
+
+ if not os.path.exists(pidfile):
+ ret = subprocess.call(
+ ['/usr/sbin/accel-pppd', '-c', pppoe_conf, '-p', pidfile, '-d'])
+ chk_con()
+ if ret != 0 and os.path.exists(pidfile):
+ os.remove(pidfile)
+ raise ConfigError('accel-pppd failed to start')
+ else:
+ accel_cmd('restart')
+ sl.syslog(sl.LOG_NOTICE, "reloading config via daemon restart")
if __name__ == '__main__':
- try:
- c = get_config()
- verify(c)
- generate(c)
- apply(c)
- except ConfigError as e:
- print(e)
- sys.exit(1)
+ try:
+ c = get_config()
+ verify(c)
+ generate(c)
+ apply(c)
+ except ConfigError as e:
+ print(e)
+ sys.exit(1)