Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
greg
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
it-bott-integrasjoner
greg
Commits
56abb051
Commit
56abb051
authored
3 years ago
by
Tore.Brede
Browse files
Options
Downloads
Patches
Plain Diff
GREG-9: Adding draft for how to store extra information about incoming request in revision
parent
c1337356
No related branches found
No related tags found
1 merge request
!9
GREG-9 Audit log
Pipeline
#87247
failed
3 years ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
gregsite/middleware/__init__.py
+0
-0
0 additions, 0 deletions
gregsite/middleware/__init__.py
gregsite/middleware/revision_user_middleware.py
+67
-0
67 additions, 0 deletions
gregsite/middleware/revision_user_middleware.py
gregsite/settings/base.py
+1
-1
1 addition, 1 deletion
gregsite/settings/base.py
with
68 additions
and
1 deletion
gregsite/middleware/__init__.py
0 → 100644
+
0
−
0
View file @
56abb051
This diff is collapsed.
Click to expand it.
gregsite/middleware/revision_user_middleware.py
0 → 100644
+
67
−
0
View file @
56abb051
from
functools
import
wraps
# from reversion.views import _request_creates_revision, create_revision
from
reversion.revisions
import
create_revision
as
create_revision_base
,
set_user
,
get_user
,
set_comment
class
RevisionUserMiddleware
:
"""
Wraps the entire request in a revision.
"""
manage_manually
=
False
using
=
None
atomic
=
True
def
__init__
(
self
,
get_response
):
self
.
get_response
=
create_revision
(
manage_manually
=
self
.
manage_manually
,
using
=
self
.
using
,
atomic
=
self
.
atomic
,
request_creates_revision
=
self
.
request_creates_revision
)(
get_response
)
def
request_creates_revision
(
self
,
request
):
return
_request_creates_revision
(
request
)
def
__call__
(
self
,
request
):
return
self
.
get_response
(
request
)
def
_request_creates_revision
(
request
):
return
request
.
method
not
in
(
"
OPTIONS
"
,
"
GET
"
,
"
HEAD
"
)
def
_set_user_from_request
(
request
):
if
getattr
(
request
,
"
user
"
,
None
)
and
request
.
user
.
is_authenticated
and
get_user
()
is
None
:
set_user
(
request
.
user
)
def
_set_comment_to_external_user_from_request
(
request
):
if
request
.
headers
.
get
(
"
External-User
"
)
is
not
None
:
set_comment
(
"
User:
"
+
request
.
headers
[
"
External-User
"
])
def
create_revision
(
manage_manually
=
False
,
using
=
None
,
atomic
=
True
,
request_creates_revision
=
None
):
"""
View decorator that wraps the request in a revision.
The revision will have it
'
s user set from the request automatically.
"""
request_creates_revision
=
request_creates_revision
or
_request_creates_revision
def
decorator
(
func
):
@wraps
(
func
)
def
do_revision_view
(
request
,
*
args
,
**
kwargs
):
if
request_creates_revision
(
request
):
with
create_revision_base
(
manage_manually
=
manage_manually
,
using
=
using
,
atomic
=
atomic
):
response
=
func
(
request
,
*
args
,
**
kwargs
)
# Otherwise, we're good.
_set_user_from_request
(
request
)
_set_comment_to_external_user_from_request
(
request
)
return
response
return
func
(
request
,
*
args
,
**
kwargs
)
return
do_revision_view
return
decorator
This diff is collapsed.
Click to expand it.
gregsite/settings/base.py
+
1
−
1
View file @
56abb051
...
@@ -56,7 +56,7 @@ MIDDLEWARE = [
...
@@ -56,7 +56,7 @@ MIDDLEWARE = [
"
django.contrib.auth.middleware.AuthenticationMiddleware
"
,
"
django.contrib.auth.middleware.AuthenticationMiddleware
"
,
"
django.contrib.messages.middleware.MessageMiddleware
"
,
"
django.contrib.messages.middleware.MessageMiddleware
"
,
"
django.middleware.clickjacking.XFrameOptionsMiddleware
"
,
"
django.middleware.clickjacking.XFrameOptionsMiddleware
"
,
'
reversion.
middleware.RevisionMiddleware
'
"
gregsite.middleware.revision_user_
middleware.Revision
User
Middleware
"
,
]
]
REST_FRAMEWORK
=
{
REST_FRAMEWORK
=
{
...
...
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