Skip to content

Commit

Permalink
Merge pull request #25409 from ankush/homepage_validate
Browse files Browse the repository at this point in the history
fix: validate homepage paths
  • Loading branch information
ankush committed Mar 13, 2024
2 parents f6a626c + d758af5 commit b331163
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 3 deletions.
4 changes: 2 additions & 2 deletions frappe/core/doctype/role/role.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"options": "Domain"
},
{
"description": "Route: Example \"/desk\"",
"description": "Route: Example \"/app\"",
"fieldname": "home_page",
"fieldtype": "Data",
"label": "Home Page"
Expand Down Expand Up @@ -148,7 +148,7 @@
"idx": 1,
"index_web_pages_for_search": 1,
"links": [],
"modified": "2023-12-08 15:52:37.525003",
"modified": "2024-03-13 20:59:37.875253",
"modified_by": "Administrator",
"module": "Core",
"name": "Role",
Expand Down
10 changes: 10 additions & 0 deletions frappe/core/doctype/role/role.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import frappe
from frappe.model.document import Document
from frappe.website.path_resolver import validate_path

desk_properties = (
"search_bar",
Expand All @@ -14,6 +15,7 @@
"timeline",
"dashboard",
)
from frappe.website.router import clear_routing_cache

STANDARD_ROLES = ("Administrator", "System Manager", "Script Manager", "All", "Guest")

Expand Down Expand Up @@ -56,13 +58,21 @@ def validate(self):
self.disable_role()
else:
self.set_desk_properties()
self.validate_homepage()

def disable_role(self):
if self.name in STANDARD_ROLES:
frappe.throw(frappe._("Standard roles cannot be disabled"))
else:
self.remove_roles()

def validate_homepage(self):
if frappe.request and self.home_page:
validate_path(self.home_page)

if self.has_value_changed("home_page"):
clear_routing_cache()

def set_desk_properties(self):
# set if desk_access is not allowed, unset all desk properties
if self.name == "Guest":
Expand Down
2 changes: 1 addition & 1 deletion frappe/tests/test_caching.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def test_user_cache_clear(self):
frappe.clear_cache(user=user1)

# Check that the keys for user1 are gone
for key in user_cache_keys:
for key in set(user_cache_keys) - {"home_page"}:
self.assertFalse(frappe.cache.hexists(key, user1))
self.assertTrue(frappe.cache.hexists(key, user2))

Expand Down
5 changes: 5 additions & 0 deletions frappe/website/doctype/portal_settings/portal_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import frappe
from frappe.model.document import Document
from frappe.website.path_resolver import validate_path


class PortalSettings(Document):
Expand Down Expand Up @@ -73,3 +74,7 @@ def remove_deleted_doctype_items(self):
for menu_item in list(self.get("menu") + self.get("custom_menu")):
if menu_item.reference_doctype not in existing_doctypes:
self.remove(menu_item)

def validate(self):
if frappe.request and self.default_portal_home:
validate_path(self.default_portal_home)
5 changes: 5 additions & 0 deletions frappe/website/path_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,8 @@ def _get():
return _get()

return frappe.cache.get_value("website_route_rules", _get)


def validate_path(path: str):
if not PathResolver(path).is_valid_path():
frappe.throw(frappe._("Path {0} it not a valid path").format(frappe.bold(path)))
1 change: 1 addition & 0 deletions frappe/website/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,3 +328,4 @@ def clear_routing_cache():
get_dynamic_web_pages.clear_cache()
get_published_web_forms.clear_cache()
get_public_pages_from_doctypes.clear_cache()
frappe.cache.delete_value("home_page")

0 comments on commit b331163

Please sign in to comment.