diff --git a/plist b/plist index 69479bbe56..2c91f291c3 100644 --- a/plist +++ b/plist @@ -1057,6 +1057,7 @@ /usr/local/opnsense/scripts/captiveportal/htdocs_default/index.html /usr/local/opnsense/scripts/captiveportal/htdocs_default/js/bootstrap.min.js /usr/local/opnsense/scripts/captiveportal/htdocs_default/js/jquery-1.11.2.min.js +/usr/local/opnsense/scripts/captiveportal/htdocs_default/js/jquery-3.5.1.min.js /usr/local/opnsense/scripts/captiveportal/lib/__init__.py /usr/local/opnsense/scripts/captiveportal/lib/arp.py /usr/local/opnsense/scripts/captiveportal/lib/daemonize.py diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/ServiceController.php b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/ServiceController.php index d5d5408dbf..c6f053d99d 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/ServiceController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/ServiceController.php @@ -1,7 +1,7 @@ request->isPost()) { - $backend = new Backend(); - $bckresult = trim($backend->configdRun("filter reload")); - if ($bckresult == "OK") { - // generate captive portal config - $bckresult = trim($backend->configdRun('template reload OPNsense/Captiveportal')); - if ($bckresult == "OK") { - $mdlCP = new CaptivePortal(); - if ($mdlCP->isEnabled()) { - $bckresult = trim($backend->configdRun("captiveportal restart")); - if ($bckresult == "OK") { - $status = "ok"; - } else { - $status = "error reloading captive portal"; - } - } else { - $backend->configdRun("captiveportal stop"); - $status = "ok"; - } - } else { - $status = "error reloading captive portal template"; - } - } else { - $status = "error reloading captive portal rules (" . $bckresult . ")"; - } + protected static $internalServiceClass = '\OPNsense\CaptivePortal\CaptivePortal'; + protected static $internalServiceTemplate = 'OPNsense/Captiveportal'; + protected static $internalServiceName = 'captiveportal'; - return array("status" => $status); - } else { - return array("status" => "failed"); - } + protected function serviceEnabled() + { + return $this->getModel()->isEnabled(); + } + + protected function invokeFirewallReload() + { + return true; } /** @@ -87,15 +63,10 @@ class ServiceController extends ApiControllerBase public function getTemplateAction($fileid = null) { // get template name - if ($fileid != null) { - $templateFileId = (new SanitizeFilter())->sanitize($fileid, 'alnum'); - } else { - $templateFileId = 'default'; - } + $templateFileId = $fileid != null ? (new SanitizeFilter())->sanitize($fileid, 'alnum') : 'default'; // request template data and output result (zipfile) - $backend = new Backend(); - $response = $backend->configdpRun("captiveportal fetch_template", array($templateFileId)); + $response = (new Backend())->configdpRun("captiveportal fetch_template", [$templateFileId]) ?? ''; $result = json_decode($response, true); if ($result != null) { $response = $result['payload']; @@ -116,55 +87,48 @@ class ServiceController extends ApiControllerBase public function saveTemplateAction() { if ($this->request->isPost() && $this->request->hasPost("name")) { + Config::getInstance()->lock(); + $content = $this->request->getPost("content", "striptags", ""); $templateName = $this->request->getPost("name", "striptags"); - $mdlCP = new CaptivePortal(); if ($this->request->hasPost("uuid")) { $uuid = $this->request->getPost("uuid", "striptags"); - $template = $mdlCP->getNodeByReference('templates.template.' . $uuid); + $template = $this->getModel()->getNodeByReference('templates.template.' . $uuid); if ($template == null) { - return array("name" => $templateName, "error" => "node not found"); + return ["name" => $templateName, "error" => "node not found"]; } } else { - $template = $mdlCP->getTemplateByName($templateName); + $template = $this->getModel()->getTemplateByName($templateName); } // cleanse input content, we only want to save changed files into our config - if ( - strlen($this->request->getPost("content", "striptags", "")) > 20 - || strlen((string)$template->content) == 0 - ) { + if (strlen($content) > 20 || strlen((string)$template->content) == 0) { $temp_filename = (new AppConfig())->application->tempDir; $temp_filename .= '/cp_' . $template->getAttributes()['uuid'] . '.tmp'; - file_put_contents($temp_filename, $this->request->getPost("content", "striptags", "")); + file_put_contents($temp_filename, $content); // strip defaults and unchanged files from template (standard js libs, etc) - $backend = new Backend(); - $response = $backend->configdpRun("captiveportal strip_template", array($temp_filename)); + $response = (new Backend())->configdpRun("captiveportal strip_template", [$temp_filename]) ?? ''; unlink($temp_filename); $result = json_decode($response, true); - if ($result != null && !array_key_exists('error', $result)) { + if (is_array($result) && !array_key_exists('error', $result)) { $template->content = $result['payload']; } else { - return array("name" => $templateName, "error" => $result['error']); + return ["name" => $templateName, "error" => $result['error']]; } } $template->name = $templateName; - $valMsgs = $mdlCP->performValidation(); - $errorMsg = ""; - foreach ($valMsgs as $field => $msg) { - if ($errorMsg != "") { - $errorMsg .= " , "; - } - $errorMsg .= $msg->getMessage(); + $errorMsg = []; + foreach ($this->getModel()->performValidation() as $validation_message) { + $errorMsg[] = (string)$validation_message; } - if ($errorMsg != "") { - return array("name" => (string)$template->name, "error" => $errorMsg); + if (!empty($errorMsg)) { + return ["name" => (string)$template->name, "error" => implode("\n", $errorMsg)]; } else { // data is valid, save and return. - $mdlCP->serializeToConfig(); + $this->getModel()->serializeToConfig(); Config::getInstance()->save(); - return array("name" => (string)$template->name); + return ["name" => (string)$template->name]; } } return null; @@ -177,13 +141,13 @@ class ServiceController extends ApiControllerBase */ public function delTemplateAction($uuid) { - $result = array("result" => "failed"); + $result = ["result" => "failed"]; if ($this->request->isPost()) { - $mdlCP = new CaptivePortal(); + Config::getInstance()->lock(); if ($uuid != null) { - if ($mdlCP->templates->template->del($uuid)) { + if ($this->getModel()->templates->template->del($uuid)) { // if item is removed, serialize to config and save - $mdlCP->serializeToConfig(); + $this->getModel()->serializeToConfig(); Config::getInstance()->save(); $result['result'] = 'deleted'; } else { @@ -201,12 +165,7 @@ class ServiceController extends ApiControllerBase */ public function searchTemplatesAction() { - $mdlCP = new CaptivePortal(); - $grid = new UIModelGrid($mdlCP->templates->template); - return $grid->fetchBindRequest( - $this->request, - array("name", "fileid"), - "name" - ); + $grid = new UIModelGrid($this->getModel()->templates->template); + return $grid->fetchBindRequest($this->request, ["name", "fileid"], "name"); } } diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SessionController.php b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SessionController.php index f680ba309e..fc574c221a 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SessionController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SessionController.php @@ -1,7 +1,7 @@ getByZoneID($zoneid); - if ($cpZone != null) { - $allClientsRaw = (new Backend())->configdpRun("captiveportal list_clients", [$cpZone->zoneid]); + if ((new CaptivePortal())->getByZoneID($zoneid) != null) { + $allClientsRaw = (new Backend())->configdpRun("captiveportal list_clients", [$zoneid]); return json_decode($allClientsRaw ?? '', true); } else { // illegal zone, return empty response @@ -80,8 +78,7 @@ class SessionController extends ApiControllerBase public function zonesAction() { $response = []; - $mdlCP = new CaptivePortal(); - foreach ($mdlCP->zones->zone->iterateItems() as $zone) { + foreach ((new CaptivePortal())->zones->zone->iterateItems() as $zone) { $response[(string)$zone->zoneid] = (string)$zone->description; } asort($response); diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SettingsController.php b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SettingsController.php index d8c566df43..11026bfc94 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SettingsController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SettingsController.php @@ -1,7 +1,7 @@ searchBase( - "zones.zone", - null, - "description" - ); + return $this->searchBase("zones.zone", null, "description"); } } diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/VoucherController.php b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/VoucherController.php index 87ee121db6..56b535491a 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/VoucherController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/VoucherController.php @@ -1,7 +1,7 @@ listServers() as $authName => $authProps) { + $result = []; + foreach ((new AuthenticationFactory())->listServers() as $authName => $authProps) { if ($authProps['type'] == 'voucher') { $result[] = $authName; } @@ -62,12 +61,11 @@ class VoucherController extends ApiControllerBase */ public function listVoucherGroupsAction($provider) { - $authFactory = new AuthenticationFactory(); - $auth = $authFactory->get(urldecode($provider)); + $auth = (new AuthenticationFactory())->get(urldecode($provider)); if ($auth != null && method_exists($auth, 'listVoucherGroups')) { return $auth->listVoucherGroups(); } else { - return array(); + return []; } } @@ -79,12 +77,11 @@ class VoucherController extends ApiControllerBase */ public function listVouchersAction($provider, $group) { - $authFactory = new AuthenticationFactory(); - $auth = $authFactory->get(urldecode($provider)); + $auth = (new AuthenticationFactory())->get(urldecode($provider)); if ($auth != null && method_exists($auth, 'listVouchers')) { return $auth->listVouchers(urldecode($group)); } else { - return array(); + return []; } } @@ -97,14 +94,13 @@ class VoucherController extends ApiControllerBase public function dropVoucherGroupAction($provider, $group) { if ($this->request->isPost()) { - $authFactory = new AuthenticationFactory(); - $auth = $authFactory->get(urldecode($provider)); + $auth = (new AuthenticationFactory())->get(urldecode($provider)); if ($auth != null && method_exists($auth, 'dropVoucherGroup')) { $auth->dropVoucherGroup(urldecode($group)); return array("status" => "drop"); } } - return array("status" => "error"); + return ["status" => "error"]; } /** @@ -116,13 +112,12 @@ class VoucherController extends ApiControllerBase public function dropExpiredVouchersAction($provider, $group) { if ($this->request->isPost()) { - $authFactory = new AuthenticationFactory(); - $auth = $authFactory->get(urldecode($provider)); + $auth = (new AuthenticationFactory())->get(urldecode($provider)); if ($auth != null && method_exists($auth, 'dropExpired')) { return array("status" => "drop", "count" => $auth->dropExpired(urldecode($group))); } } - return array("status" => "error"); + return ["status" => "error"]; } @@ -133,10 +128,9 @@ class VoucherController extends ApiControllerBase */ public function generateVouchersAction($provider) { - $response = array("status" => "error"); + $response = ["status" => "error"]; if ($this->request->isPost()) { - $authFactory = new AuthenticationFactory(); - $auth = $authFactory->get(urldecode($provider)); + $auth = (new AuthenticationFactory())->get(urldecode($provider)); if ($auth != null && method_exists($auth, 'generateVouchers')) { $count = $this->request->getPost('count', 'int', 0); $validity = $this->request->getPost('validity', 'int', 0); @@ -162,11 +156,10 @@ class VoucherController extends ApiControllerBase */ public function expireVoucherAction($provider) { - $response = array("status" => "error"); + $response = ["status" => "error"]; $username = $this->request->getPost('username', 'string', null); if ($this->request->isPost() && $username != null) { - $authFactory = new AuthenticationFactory(); - $auth = $authFactory->get(urldecode($provider)); + $auth = (new AuthenticationFactory())->get(urldecode($provider)); if ($auth != null && method_exists($auth, 'expireVoucher')) { $auth->expireVoucher($username); $response['status'] = 'ok'; diff --git a/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt b/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt index 61e483a12c..855f64e715 100644 --- a/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt +++ b/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt @@ -141,6 +141,8 @@ } }); }); + + updateServiceControlUI('captiveportal'); }); @@ -181,7 +183,7 @@ -{{ partial('layout_partials/base_apply_button', {'data_endpoint': '/api/captiveportal/service/reconfigure'}) }} +{{ partial('layout_partials/base_apply_button', {'data_endpoint': '/api/captiveportal/service/reconfigure', 'data_service_widget': 'captiveportal'}) }} {# include dialogs #} {{ partial("layout_partials/base_dialog",['fields':formDialogZone,'id':formGridZone['edit_dialog_id'],'label':lang._('Edit zone')])}} diff --git a/src/opnsense/scripts/captiveportal/fetch_template.py b/src/opnsense/scripts/captiveportal/fetch_template.py index 746b4fd581..cf507a0828 100755 --- a/src/opnsense/scripts/captiveportal/fetch_template.py +++ b/src/opnsense/scripts/captiveportal/fetch_template.py @@ -1,7 +1,7 @@ #!/usr/local/bin/python3 """ - Copyright (c) 2015-2019 Ad Schellevis + Copyright (c) 2015-2025 Ad Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ from io import BytesIO from lib import OPNsenseConfig response = dict() -source_directory = '/usr/local/opnsense/scripts/captiveportal/htdocs_default' +source_directory = '%s/htdocs_default' % os.path.realpath(os.path.dirname(__file__)) output_data = BytesIO() @@ -71,8 +71,7 @@ with zipfile.ZipFile(output_data, mode='w', compression=zipfile.ZIP_DEFLATED) as filename = '%s/%s' % (root, filename) output_filename = filename[len(source_directory)+1:] if output_filename not in user_filenames: - tmp = open(filename, 'rb').read() - zf.writestr(output_filename, tmp) + zf.writestr(output_filename, open(filename, 'rb').read()) response['payload'] = base64.b64encode(output_data.getvalue()).decode() response['size'] = len(response['payload']) diff --git a/src/opnsense/scripts/captiveportal/htdocs_default/exclude.list b/src/opnsense/scripts/captiveportal/htdocs_default/exclude.list index ff2c3ba54a..7ac685bcb8 100755 --- a/src/opnsense/scripts/captiveportal/htdocs_default/exclude.list +++ b/src/opnsense/scripts/captiveportal/htdocs_default/exclude.list @@ -1,5 +1,6 @@ # This list contains the filenames that may not be overwritten by the user when creating custom templates. # All items in this list won't be stored in the config.xml by our framework +css/bootstrap-theme.min css/bootstrap.css.map css/bootstrap.min.css fonts/glyphicons-halflings-regular.eot @@ -8,3 +9,5 @@ fonts/glyphicons-halflings-regular.ttf fonts/glyphicons-halflings-regular.woff fonts/glyphicons-halflings-regular.woff2 js/bootstrap.min.js +js/jquery-1.11.2.min.js +js/jquery-3.5.1.min.js diff --git a/src/opnsense/scripts/captiveportal/htdocs_default/js/jquery-3.5.1.min.js b/src/opnsense/scripts/captiveportal/htdocs_default/js/jquery-3.5.1.min.js new file mode 100644 index 0000000000..b0614034ad --- /dev/null +++ b/src/opnsense/scripts/captiveportal/htdocs_default/js/jquery-3.5.1.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 + Copyright (c) 2015-2025 Ad Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ -------------------------------------------------------------------------------------- read a user provided base64 encoded zip file and generate a new one without standard files. (strips javascript etc) - Filename should be provided by user parameter and must be available in /tmp/ + Filename should be provided by user parameter and must be available in /var/lib/php/tmp """ import sys import os.path @@ -39,19 +39,7 @@ import base64 from io import BytesIO from hashlib import md5 -htdocs_default_root = '/usr/local/opnsense/scripts/captiveportal/htdocs_default' - - -def load_exclude_list(): - """ load exclude list, files that should be removed from the input stream - """ - result = [] - excl_filename = '%s/exclude.list' % htdocs_default_root - for line in open(excl_filename, 'r').read().split('\n'): - line = line.strip() - if len(line) > 1 and line[0] != '#': - result.append(line) - return result +htdocs_default_root = '%s/htdocs_default' % os.path.realpath(os.path.dirname(__file__)) response = dict() @@ -71,7 +59,8 @@ else: response['error'] = 'Error reading file' if 'error' not in response: - exclude_list = load_exclude_list() + with open('%s/exclude.list' % htdocs_default_root, 'r') as f_in: + exclude_list = [x.strip() for x in f_in if len(x) > 2 and not x.strip().startswith('#')] input_data = BytesIO(zip_content) output_data = BytesIO() with zipfile.ZipFile(input_data, mode='r', compression=zipfile.ZIP_DEFLATED) as zf_in: @@ -81,16 +70,17 @@ if 'error' not in response: for zf_info in zf_in.infolist(): if zf_info.filename.find('index.html') > -1: if index_location is None or len(index_location) > len(zf_info.filename): - index_location = zf_info.filename + index_location = zf_info.filename.replace('index.html', '') if index_location is not None: for zf_info in zf_in.infolist(): if zf_info.filename[-1] != '/': - filename = zf_info.filename.replace(index_location.replace('index.html', ''), '') + filename = zf_info.filename.replace(index_location, '') # ignore internal osx metadata files, maybe we need to ignore some others (windows?) as well # here. - if filename.split('/')[0] == '__MACOSX' or filename.split('/')[-1] == '.DS_Store': + skip_list = set(['__MACOSX', '.DS_Store', '._.']) + if len(set(filename.split('/')).intersection(skip_list)) > 0: continue - if filename not in exclude_list: + elif filename not in exclude_list: file_data = zf_in.read(zf_info.filename) src_filename = '%s/%s' % (htdocs_default_root, filename) if os.path.isfile(src_filename): diff --git a/src/opnsense/service/conf/actions.d/actions_captiveportal.conf b/src/opnsense/service/conf/actions.d/actions_captiveportal.conf index 4147b8d2c3..2b8b89ebc5 100644 --- a/src/opnsense/service/conf/actions.d/actions_captiveportal.conf +++ b/src/opnsense/service/conf/actions.d/actions_captiveportal.conf @@ -41,6 +41,13 @@ type:script message:restarting captiveportal services description:Restart Captive Portal service +[status] +command:/usr/local/sbin/pluginctl -s captiveportal status +parameters: +type:script_output +message:request captiveportal status + + [fetch_template] command:/usr/local/opnsense/scripts/captiveportal/fetch_template.py parameters:%s