lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Captiveportal, new) minor fixes to core voucher code

Browse Source
This commit is contained in:
Ad Schellevis 2015-11-05 14:46:26 +01:00
parent 0cadf36d9d
commit 152e392bd6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/opnsense/mvc/app/library/OPNsense/Auth/Voucher.php
View File

@ -146,13 +146,16 @@ class Voucher implements IAuthConnector
{
$response = array();
if ($this->dbHandle != null) {
// list of characters to skip for random generator
$doNotUseChr = array('<', '>');
// create map of random readable characters
$characterMap = '';
while (strlen($characterMap) < 256) {
$random_bytes = openssl_random_pseudo_bytes(10000);
for ($i = 0; $i < strlen($random_bytes); $i++) {
$chr_ord = ord($random_bytes[$i]);
if ($chr_ord >= 33 and $chr_ord <= 125) {
if ($chr_ord >= 33 and $chr_ord <= 125 and !in_array($random_bytes[$i], $doNotUseChr)) {
$characterMap .= $random_bytes[$i] ;
}
}
@ -248,9 +251,13 @@ class Voucher implements IAuthConnector
$record = array();
$record['username'] = $row['username'];
$record['validity'] = $row['validity'];
$record['starttime'] = $row['starttime'];
# always calculate a starttime, if not registered yet, use now.
$record['starttime'] = empty($row['starttime']) ? time() : $row['starttime'] ;
$record['endtime'] = $record['starttime'] + $row['validity'];
if ($row['starttime'] == null || time() - $row['starttime'] < $row['validity']) {
if (empty($row['starttime'])) {
$record['state'] = 'unused';
} elseif (time() > $row['endtime']) {
$record['state'] = 'valid';
} else {
$record['state'] = 'expired';