Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
django-cas-server
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Samir
django-cas-server
Commits
a6cf8aaa
Unverified
Commit
a6cf8aaa
authored
Jan 12, 2019
by
Valentin Samir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix invalid escape sequence \. in regular expression \\.
parent
248658b5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
25 deletions
+26
-25
CHANGELOG.rst
CHANGELOG.rst
+1
-0
cas_server/tests/mixin.py
cas_server/tests/mixin.py
+9
-9
cas_server/tests/test_models.py
cas_server/tests/test_models.py
+2
-2
cas_server/tests/test_view.py
cas_server/tests/test_view.py
+13
-13
cas_server/views.py
cas_server/views.py
+1
-1
No files found.
CHANGELOG.rst
View file @
a6cf8aaa
...
...
@@ -23,6 +23,7 @@ Fixes
isFromNewLogin from service validation response
* Catch error from calling django.contrib.staticfiles.templatetags.staticfiles.static
in non-debug mode before collectstatic in cas_server.default_settings.py
* Invalid escape sequence in regular expression
Deprecated
----------
...
...
cas_server/tests/mixin.py
View file @
a6cf8aaa
...
...
@@ -30,7 +30,7 @@ class BaseServicePattern(object):
cls
.
service
=
"https://www.example.com"
cls
.
service_pattern
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"example"
,
pattern
=
"^https://www
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://www\.example\.com(/.*)?$"
,
proxy
=
proxy
,
)
models
.
ReplaceAttributName
.
objects
.
create
(
name
=
"*"
,
service_pattern
=
cls
.
service_pattern
)
...
...
@@ -39,14 +39,14 @@ class BaseServicePattern(object):
cls
.
service_restrict_user_fail
=
"https://restrict_user_fail.example.com"
cls
.
service_pattern_restrict_user_fail
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"restrict_user_fail"
,
pattern
=
"^https://restrict_user_fail
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://restrict_user_fail\.example\.com(/.*)?$"
,
restrict_users
=
True
,
proxy
=
proxy
,
)
cls
.
service_restrict_user_success
=
"https://restrict_user_success.example.com"
cls
.
service_pattern_restrict_user_success
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"restrict_user_success"
,
pattern
=
"^https://restrict_user_success
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://restrict_user_success\.example\.com(/.*)?$"
,
restrict_users
=
True
,
proxy
=
proxy
,
)
...
...
@@ -59,7 +59,7 @@ class BaseServicePattern(object):
cls
.
service_filter_fail
=
"https://filter_fail.example.com"
cls
.
service_pattern_filter_fail
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"filter_fail"
,
pattern
=
"^https://filter_fail
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://filter_fail\.example\.com(/.*)?$"
,
proxy
=
proxy
,
)
models
.
FilterAttributValue
.
objects
.
create
(
...
...
@@ -70,7 +70,7 @@ class BaseServicePattern(object):
cls
.
service_filter_fail_alt
=
"https://filter_fail_alt.example.com"
cls
.
service_pattern_filter_fail_alt
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"filter_fail_alt"
,
pattern
=
"^https://filter_fail_alt
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://filter_fail_alt\.example\.com(/.*)?$"
,
proxy
=
proxy
,
)
models
.
FilterAttributValue
.
objects
.
create
(
...
...
@@ -81,7 +81,7 @@ class BaseServicePattern(object):
cls
.
service_filter_success
=
"https://filter_success.example.com"
cls
.
service_pattern_filter_success
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"filter_success"
,
pattern
=
"^https://filter_success
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://filter_success\.example\.com(/.*)?$"
,
proxy
=
proxy
,
)
models
.
FilterAttributValue
.
objects
.
create
(
...
...
@@ -94,21 +94,21 @@ class BaseServicePattern(object):
cls
.
service_field_needed_fail
=
"https://field_needed_fail.example.com"
cls
.
service_pattern_field_needed_fail
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"field_needed_fail"
,
pattern
=
"^https://field_needed_fail
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://field_needed_fail\.example\.com(/.*)?$"
,
user_field
=
"uid"
,
proxy
=
proxy
,
)
cls
.
service_field_needed_success
=
"https://field_needed_success.example.com"
cls
.
service_pattern_field_needed_success
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"field_needed_success"
,
pattern
=
"^https://field_needed_success
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://field_needed_success\.example\.com(/.*)?$"
,
user_field
=
"alias"
,
proxy
=
proxy
,
)
cls
.
service_field_needed_success_alt
=
"https://field_needed_success_alt.example.com"
cls
.
service_pattern_field_needed_success
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"field_needed_success_alt"
,
pattern
=
"^https://field_needed_success_alt
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://field_needed_success_alt\.example\.com(/.*)?$"
,
user_field
=
"nom"
,
proxy
=
proxy
,
)
...
...
cas_server/tests/test_models.py
View file @
a6cf8aaa
...
...
@@ -140,7 +140,7 @@ class UserTestCase(TestCase, UserModels):
self
.
service
=
'http://127.0.0.1:45678'
self
.
service_pattern
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"localhost"
,
pattern
=
"^https?://127
\
.0
\
.0
\
.1(:[0-9]+)?(/.*)?$"
,
pattern
=
r
"^https?://127\.0\.0\.1(:[0-9]+)?(/.*)?$"
,
single_log_out
=
True
)
models
.
ReplaceAttributName
.
objects
.
create
(
name
=
"*"
,
service_pattern
=
self
.
service_pattern
)
...
...
@@ -241,7 +241,7 @@ class TicketTestCase(TestCase, UserModels, BaseServicePattern):
self
.
service
=
'http://127.0.0.1:45678'
self
.
service_pattern
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"localhost"
,
pattern
=
"^https?://127
\
.0
\
.0
\
.1(:[0-9]+)?(/.*)?$"
,
pattern
=
r
"^https?://127\.0\.0\.1(:[0-9]+)?(/.*)?$"
,
single_log_out
=
True
)
models
.
ReplaceAttributName
.
objects
.
create
(
name
=
"*"
,
service_pattern
=
self
.
service_pattern
)
...
...
cas_server/tests/test_view.py
View file @
a6cf8aaa
...
...
@@ -710,7 +710,7 @@ class LogoutTestCase(TestCase):
self
.
service
=
'http://127.0.0.1:45678'
self
.
service_pattern
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"localhost"
,
pattern
=
"^https?://127
\
.0
\
.0
\
.1(:[0-9]+)?(/.*)?$"
,
pattern
=
r
"^https?://127\.0\.0\.1(:[0-9]+)?(/.*)?$"
,
single_log_out
=
True
)
# return all user attributes
...
...
@@ -984,7 +984,7 @@ class AuthTestCase(TestCase):
self
.
service
=
'https://www.example.com'
models
.
ServicePattern
.
objects
.
create
(
name
=
"example"
,
pattern
=
"^https://www
\
.example
\
.com(/.*)?$"
pattern
=
r
"^https://www\.example\.com(/.*)?$"
)
@
override_settings
(
CAS_AUTH_SHARED_SECRET
=
'test'
)
...
...
@@ -1120,7 +1120,7 @@ class ValidateTestCase(TestCase):
self
.
service
=
'https://www.example.com'
self
.
service_pattern
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"example"
,
pattern
=
"^https://www
\
.example
\
.com(/.*)?$"
pattern
=
r
"^https://www\.example\.com(/.*)?$"
)
models
.
ReplaceAttributName
.
objects
.
create
(
name
=
"*"
,
service_pattern
=
self
.
service_pattern
)
# setting up a test service and pattern using a multi valued user attribut as username
...
...
@@ -1128,14 +1128,14 @@ class ValidateTestCase(TestCase):
self
.
service_user_field
=
"https://user_field.example.com"
self
.
service_pattern_user_field
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"user field"
,
pattern
=
"^https://user_field
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://user_field\.example\.com(/.*)?$"
,
user_field
=
"alias"
)
# setting up a test service and pattern using a single valued user attribut as username
self
.
service_user_field_alt
=
"https://user_field_alt.example.com"
self
.
service_pattern_user_field_alt
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"user field alt"
,
pattern
=
"^https://user_field_alt
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://user_field_alt\.example\.com(/.*)?$"
,
user_field
=
"nom"
)
...
...
@@ -1272,7 +1272,7 @@ class ValidateServiceTestCase(TestCase, XmlContent):
self
.
service
=
'http://127.0.0.1:45678'
self
.
service_pattern
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"localhost"
,
pattern
=
"^https?://127
\
.0
\
.0
\
.1(:[0-9]+)?(/.*)?$"
,
pattern
=
r
"^https?://127\.0\.0\.1(:[0-9]+)?(/.*)?$"
,
# allow to request PGT by the service
proxy_callback
=
True
,
# allow to request PT for the service
...
...
@@ -1285,14 +1285,14 @@ class ValidateServiceTestCase(TestCase, XmlContent):
self
.
service_user_field
=
"https://user_field.example.com"
self
.
service_pattern_user_field
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"user field"
,
pattern
=
"^https://user_field
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://user_field\.example\.com(/.*)?$"
,
user_field
=
"alias"
)
# test service pattern using the attribute nom as username
self
.
service_user_field_alt
=
"https://user_field_alt.example.com"
self
.
service_pattern_user_field_alt
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"user field alt"
,
pattern
=
"^https://user_field_alt
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://user_field_alt\.example\.com(/.*)?$"
,
user_field
=
"nom"
)
...
...
@@ -1300,7 +1300,7 @@ class ValidateServiceTestCase(TestCase, XmlContent):
self
.
service_one_attribute
=
"https://one_attribute.example.com"
self
.
service_pattern_one_attribute
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"one_attribute"
,
pattern
=
"^https://one_attribute
\
.example
\
.com(/.*)?$"
pattern
=
r
"^https://one_attribute\.example\.com(/.*)?$"
)
models
.
ReplaceAttributName
.
objects
.
create
(
name
=
"nom"
,
...
...
@@ -1311,7 +1311,7 @@ class ValidateServiceTestCase(TestCase, XmlContent):
self
.
service_replace_attribute_list
=
"https://replace_attribute_list.example.com"
self
.
service_pattern_replace_attribute_list
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"replace_attribute_list"
,
pattern
=
"^https://replace_attribute_list
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://replace_attribute_list\.example\.com(/.*)?$"
,
)
models
.
ReplaceAttributValue
.
objects
.
create
(
attribut
=
"alias"
,
...
...
@@ -1327,7 +1327,7 @@ class ValidateServiceTestCase(TestCase, XmlContent):
self
.
service_replace_attribute
=
"https://replace_attribute.example.com"
self
.
service_pattern_replace_attribute
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"replace_attribute"
,
pattern
=
"^https://replace_attribute
\
.example
\
.com(/.*)?$"
,
pattern
=
r
"^https://replace_attribute\.example\.com(/.*)?$"
,
)
models
.
ReplaceAttributValue
.
objects
.
create
(
attribut
=
"nom"
,
...
...
@@ -1683,7 +1683,7 @@ class ProxyTestCase(TestCase, BaseServicePattern, XmlContent):
self
.
service
=
'http://127.0.0.1'
self
.
service_pattern
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"localhost"
,
pattern
=
"^http://127
\
.0
\
.0
\
.1(:[0-9]+)?(/.*)?$"
,
pattern
=
r
"^http://127\.0\.0\.1(:[0-9]+)?(/.*)?$"
,
proxy
=
True
,
proxy_callback
=
True
)
...
...
@@ -1857,7 +1857,7 @@ class SamlValidateTestCase(TestCase, BaseServicePattern, XmlContent):
self
.
service_pgt
=
'http://127.0.0.1'
self
.
service_pattern_pgt
=
models
.
ServicePattern
.
objects
.
create
(
name
=
"localhost"
,
pattern
=
"^http://127
\
.0
\
.0
\
.1(:[0-9]+)?(/.*)?$"
,
pattern
=
r
"^http://127\.0\.0\.1(:[0-9]+)?(/.*)?$"
,
proxy
=
True
,
proxy_callback
=
True
)
...
...
cas_server/views.py
View file @
a6cf8aaa
...
...
@@ -1160,7 +1160,7 @@ class ValidateService(View):
# if pgtUrl is set, require https or localhost
if
self
.
pgt_url
and
(
self
.
pgt_url
.
startswith
(
"https://"
)
or
re
.
match
(
"^http://(127
\
.0
\
.0
\
.1|localhost)(:[0-9]+)?(/.*)?$"
,
self
.
pgt_url
)
re
.
match
(
r
"^http://(127\.0\.0\.1|localhost)(:[0-9]+)?(/.*)?$"
,
self
.
pgt_url
)
):
return
self
.
process_pgturl
(
params
)
else
:
...
...
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