lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(captiveportal, new) work in progress script base

Browse Source
This commit is contained in:
Ad Schellevis 2015-09-29 10:34:55 +02:00
parent 9d81789c4f
commit 7c4f9c3719
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opnsense/scripts/OPNsense/CaptivePortal/allow.py
View File

@ -66,9 +66,9 @@ if parameters['ip_address'] is not None and parameters['zoneid'] is not None:
# add accounting for this ip address
cpIPFW.add_accounting(parameters['ip_address'])
response['state'] = 'AUTHORIZED'
response['clientState'] = 'AUTHORIZED'
else:
response = {'state': 'UNKNOWN'}
response = {'clientState': 'UNKNOWN'}
# output result as plain text or json

31
src/opnsense/scripts/OPNsense/CaptivePortal/lib/db.py
View File

@ -68,27 +68,27 @@ class DB(object):
"""
response = dict()
response['zoneid'] = zoneid
response['username'] = username
response['ip_address'] = ip_address
response['mac_address'] = mac_address
response['created'] = time.time() # record creation = sign-in time
response['sessionid'] = base64.b64encode(os.urandom(16)) # generate a new random session id
response['userName'] = username
response['ipAddress'] = ip_address
response['macAddress'] = mac_address
response['startTime'] = time.time() # record creation = sign-in time
response['sessionId'] = base64.b64encode(os.urandom(16)) # generate a new random session id
cur = self._connection.cursor()
# update cp_clients in case there's already a user logged-in at this ip address.
# places an implicit lock on this client.
cur.execute("""update cp_clients
set created = :created
, username = :username
, mac_address = :mac_address
set created = :startTime
, username = :userName
, mac_address = :macAddress
where zoneid = :zoneid
and ip_address = :ip_address
and ip_address = :ipAddress
""", response)
# normal operation, new user at this ip, add to host
if cur.rowcount == 0:
cur.execute("""insert into cp_clients(zoneid, sessionid, username, ip_address, mac_address, created)
values (:zoneid, :sessionid, :username, :ip_address, :mac_address, :created)
values (:zoneid, :sessionId, :userName, :ipAddress, :macAddress, :startTime)
""", response)
self._connection.commit()
@ -102,7 +102,16 @@ class DB(object):
result = list()
fieldnames = list()
cur = self._connection.cursor()
cur.execute("select * from cp_clients where zoneid = :zoneid", {'zoneid': zoneid})
# rename fields for API
cur.execute(""" select zoneid
, sessionid sessionId
, username userName
, created startTime
, ip_address ipAddress
, mac_address macAddress
from cp_clients
where zoneid = :zoneid
""", {'zoneid': zoneid})
while True:
# fetch field names
if len(fieldnames) == 0: