Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Patchport the fix of CVE-2024-45314 #2270

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions flask_appbuilder/security/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@
P = ParamSpec("P")


def no_cache(view: Callable[..., Response]) -> Callable[..., Response]:
@functools.wraps(view)
def wrapped_view(*args, **kwargs) -> Response:
response = make_response(view(*args, **kwargs))
response.headers[
"Cache-Control"
] = "no-store, no-cache, must-revalidate, max-age=0"
response.headers["Pragma"] = "no-cache"
response.headers["Expires"] = "0"
return response

return wrapped_view

def response_unauthorized_mvc(status_code: int) -> Response:
response = make_response(
jsonify({"message": str(FLAMSG_ERR_SEC_ACCESS_DENIED), "severity": "danger"}),
Expand Down
5 changes: 4 additions & 1 deletion flask_appbuilder/security/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from flask_appbuilder.baseviews import BaseView
from flask_appbuilder.charts.views import DirectByChartView
from flask_appbuilder.fieldwidgets import BS3PasswordFieldWidget
from flask_appbuilder.security.decorators import has_access
from flask_appbuilder.security.decorators import has_access, no_cache
from flask_appbuilder.security.forms import (
DynamicForm,
LoginForm_db,
Expand Down Expand Up @@ -520,6 +520,7 @@ class AuthDBView(AuthView):
login_template = "appbuilder/general/security/login_db.html"

@expose("/login/", methods=["GET", "POST"])
@no_cache
def login(self):
if g.user is not None and g.user.is_authenticated:
return redirect(self.appbuilder.get_url_for_index)
Expand All @@ -543,6 +544,7 @@ class AuthLDAPView(AuthView):
login_template = "appbuilder/general/security/login_ldap.html"

@expose("/login/", methods=["GET", "POST"])
@no_cache
def login(self):
if g.user is not None and g.user.is_authenticated:
return redirect(self.appbuilder.get_url_for_index)
Expand All @@ -568,6 +570,7 @@ class AuthOIDView(AuthView):
oid_ask_for_optional: List[str] = []

@expose("/login/", methods=["GET", "POST"])
@no_cache
def login(self, flag=True) -> WerkzeugResponse:
@self.appbuilder.sm.oid.loginhandler
def login_handler(self):
Expand Down
13 changes: 13 additions & 0 deletions tests/security/test_mvc_security.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@ class Model1View(ModelView):

self.appbuilder.add_view(Model1View, "Model1", category="Model1")

def test_sec_login_no_cache(self):
"""
Test Security Login, no cache directives
"""
rv = self.client.get("/login/")
assert rv.status_code == 200
assert (
rv.headers.get("Cache-Control")
== "no-store, no-cache, must-revalidate, max-age=0"
)
assert rv.headers["Pragma"] == "no-cache"
assert rv.headers["Expires"] == "0"

def test_sec_login(self):
"""
Test Security Login, Logout, invalid login, invalid access
Expand Down
Loading