Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
common-web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
protokollsystem
common-web
Commits
c3a8dbca
Commit
c3a8dbca
authored
7 years ago
by
Robin Sonnabend
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of git.fsmpi.rwth-aachen.de:protokollsystem/common-web
parents
c16fe3b2
b6a8aa25
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
auth.py
+4
-1
4 additions, 1 deletion
auth.py
back.py
+0
-1
0 additions, 1 deletion
back.py
csrf.py
+2
-0
2 additions, 0 deletions
csrf.py
with
6 additions
and
2 deletions
auth.py
+
4
−
1
View file @
c3a8dbca
...
...
@@ -17,6 +17,9 @@ class User:
self
.
obsolete
=
obsolete
self
.
permanent
=
permanent
def
__repr__
(
self
):
return
"
<User({})>
"
.
format
(
self
.
username
)
def
summarize
(
self
):
return
"
:
"
.
join
((
self
.
username
,
"
,
"
.
join
(
self
.
groups
),
"
,
"
.
join
(
self
.
all_groups
),
...
...
@@ -33,7 +36,7 @@ class User:
timestamp
=
datetime
.
fromtimestamp
(
float
(
timestamp_str
))
obsolete
=
obsolete_str
==
"
True
"
groups
=
group_str
.
split
(
"
,
"
)
all_groups
=
group_str
.
split
(
"
,
"
)
all_groups
=
all_
group_str
.
split
(
"
,
"
)
permanent
=
permanent_str
==
"
True
"
return
User
(
name
,
groups
,
all_groups
,
timestamp
,
obsolete
,
permanent
)
...
...
This diff is collapsed.
Click to expand it.
back.py
+
0
−
1
View file @
c3a8dbca
...
...
@@ -28,7 +28,6 @@ def url(default=default_view, cookie=cookie, **url_args):
def
redirect
(
default
=
default_view
,
cookie
=
cookie
,
**
url_args
):
print
(
request
.
url
,
request
.
url_rule
,
default
,
session
.
get
(
cookie
))
target
=
url
(
default
,
cookie
,
**
url_args
)
if
target
==
request
.
url
:
target
=
default_url
(
default
,
**
url_args
)
...
...
This diff is collapsed.
Click to expand it.
csrf.py
+
2
−
0
View file @
c3a8dbca
from
functools
import
wraps
from
hmac
import
compare_digest
import
hashlib
import
os
from
flask
import
request
,
abort
,
session
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment