Skip to content

Fix(routes): Add hash requirements for frontpage routes #2555

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.

Sign up for GitHub

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

Merged
Chartman123 merged 1 commit into from
Feb 14, 2025
Merged

Fix(routes): Add hash requirements for frontpage routes #2555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions lib/Constants.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,6 @@
use OCP\Share\IShare;

class Constants {
/**
* Constants for API Controllers
*/
public const API_BASE = '/api/{apiVersion}/';
public const API_V3_REQUIREMENTS = [
'apiVersion' => 'v3',
'formId' => '\d+',
'questionId' => '\d+',
'optionId' => '\d+',
'shareId' => '\d+',
'submissionId' => '\d+',
'path' => '.+'
];

/**
* Used AppConfig Keys
*/
Expand Down
6 changes: 3 additions & 3 deletions lib/Controller/PageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function index(?string $hash = null): TemplateResponse {
*/
#[NoAdminRequired()]
#[NoCSRFRequired()]
#[FrontpageRoute(verb: 'GET', url: '/{hash}/{view}')]
#[FrontpageRoute(verb: 'GET', url: '/{hash}/{view}', requirements: ['hash' => '[a-zA-Z0-9]{16,}'])]
public function views(string $hash): TemplateResponse {
return $this->index($hash);
}
Expand All @@ -96,7 +96,7 @@ public function views(string $hash): TemplateResponse {
#[NoAdminRequired()]
#[NoCSRFRequired()]
#[PublicPage()]
#[FrontpageRoute(verb: 'GET', url: '/{hash}')]
#[FrontpageRoute(verb: 'GET', url: '/{hash}', requirements: ['hash' => '[a-zA-Z0-9]{16,}'])]
public function internalLinkView(string $hash): Response {
$internalView = $this->urlGenerator->linkToRoute('forms.page.views', ['hash' => $hash, 'view' => 'submit']);

Expand All @@ -116,7 +116,7 @@ public function internalLinkView(string $hash): Response {
#[NoAdminRequired()]
#[NoCSRFRequired()]
#[PublicPage()]
#[FrontpageRoute(verb: 'GET', url: '/s/{hash}')]
#[FrontpageRoute(verb: 'GET', url: '/s/{hash}', requirements: ['hash' => '[a-zA-Z0-9]{24,}'])]
public function publicLinkView(string $hash): Response {
try {
$share = $this->shareMapper->findPublicShareByHash($hash);
Expand Down
Loading