Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
a7ef4192
Commit
a7ef4192
authored
Feb 07, 2017
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(captive portal) add group enforcement, closes
https://github.com/opnsense/core/issues/1377
parent
0d104a9d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
0 deletions
+14
-0
AccessController.php
...ntrollers/OPNsense/CaptivePortal/Api/AccessController.php
+5
-0
dialogZone.xml
...p/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
+6
-0
CaptivePortal.xml
...e/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
+3
-0
No files found.
src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/AccessController.php
View file @
a7ef4192
...
...
@@ -148,6 +148,11 @@ class AccessController extends ApiControllerBase
$this
->
request
->
getPost
(
"password"
,
"string"
)
);
// check group when group enforcement is set
if
(
$isAuthenticated
&&
(
string
)
$cpZone
->
authEnforceGroup
!=
""
)
{
$isAuthenticated
=
$authServer
->
groupAllowed
(
$userName
,
$cpZone
->
authEnforceGroup
);
}
if
(
$isAuthenticated
)
{
// stop trying, when authenticated
break
;
...
...
src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
View file @
a7ef4192
...
...
@@ -26,6 +26,12 @@
<style>
tokenize
</style>
<help>
<![CDATA[Select authentication methods to use, leave empty for no authentication needed.]]>
</help>
</field>
<field>
<id>
zone.authEnforceGroup
</id>
<label>
Enforce local group
</label>
<type>
dropdown
</type>
<help>
<![CDATA[Restrict access to users in the selected (local)group.]]>
</help>
</field>
<field>
<id>
zone.idletimeout
</id>
<label>
Idle timeout (minutes)
</label>
...
...
src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
View file @
a7ef4192
...
...
@@ -31,6 +31,9 @@
<multiple>
Y
</multiple>
<default>
Local Database
</default>
</authservers>
<authEnforceGroup
type=
"AuthGroupField"
>
<Required>
N
</Required>
</authEnforceGroup>
<idletimeout
type=
"IntegerField"
>
<Required>
Y
</Required>
<Default>
0
</Default>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment