profxadke/captive.whump.shanti-portal
1
0
Fork 0
mirror of https://codeberg.org/prof_x_pvt_ltd/captive.whump.shanti-portal synced 2024-08-14 22:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

storage.cfg is not necessary, moving to plugins.cfg to save on files and confusion.

Browse source
This commit is contained in:
Stefan Midjich 2017-11-16 22:17:40 +01:00
parent b23468ed28
commit 4c9f133f9a
3 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins.cfg
View file

@ -33,3 +33,15 @@ debug = True
# Simply prepend sudo here if you won't run rq worker as root # Simply prepend sudo here if you won't run rq worker as root
ipset_add_cmd = ipset -exist add authenticated-clients {client_ip} ipset_add_cmd = ipset -exist add authenticated-clients {client_ip}
ipset_name = authenticated-clients ipset_name = authenticated-clients
# Dummy plugin to provide the client plugin with storage config while
# simultaneously providing the manage_client tool with its storage config.
[postgres]
hostname=localhost
username=captiveportal
password=secret.
database=captiveportal
port=5432
enabled = False
mandatory = False

14
tools/manage_client.py
View file

@ -2,6 +2,7 @@
# Python helper tool to add IPtables rule using the iptc library. This must # Python helper tool to add IPtables rule using the iptc library. This must
# of course run as root for iptc to work. # of course run as root for iptc to work.
from os import getuid
from sys import exit from sys import exit
from argparse import ArgumentParser, FileType, ArgumentTypeError from argparse import ArgumentParser, FileType, ArgumentTypeError
from pprint import pprint as pp from pprint import pprint as pp
@ -97,13 +98,18 @@ config.readfp(args.config)
sr = StoragePostgres(config=config) sr = StoragePostgres(config=config)
if args.refresh: if args.refresh:
if getuid() == 0:
use_sudo = False
else:
use_sudo = True
# Sync clients and packet counters from ipset into storage. # Sync clients and packet counters from ipset into storage.
proc = run_ipset( proc = run_ipset(
'list', 'list',
config.get('ipset', 'set_name'), config.get('ipset', 'ipset_name'),
'-output', '-output',
'save', 'save',
use_sudo=False, use_sudo=use_sudo,
timeout=600 timeout=600
) )
@ -130,7 +136,7 @@ if args.refresh:
client = Client( client = Client(
storage=sr, storage=sr,
ip_address=client_ip, ip_address=client_ip,
ipset_name=config.get('ipset', 'set_name') ipset_name=config.get('ipset', 'ipset_name')
) )
except Exception as e: except Exception as e:
if args.verbose: if args.verbose:
@ -173,7 +179,7 @@ for src_ip in args.src_ip:
client = Client( client = Client(
storage=sr, storage=sr,
ip_address=src_ip, ip_address=src_ip,
ipset_name=config.get('ipset', 'set_name') ipset_name=config.get('ipset', 'ipset_name')
) )
if args.delete: if args.delete:

9
tools/storage.cfg
View file

@ -1,9 +0,0 @@
[postgres]
hostname=localhost
username=captiveportal
password=secret.
database=captiveportal
port=5432
[ipset]
set_name=authenticated-clients