Skip to content

Commit 0d4efc8

Browse files
mrflosmrflos
committed
fix(api): acls cannot be public and admins a the same time
1 parent 6894234 commit 0d4efc8

File tree

4 files changed

+28
-29
lines changed

4 files changed

+28
-29
lines changed

‎docs/en/dev.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ to
575575

576576
```php
577577
/**
578-
* @Route("/api/myroute",options={"acl":{"public","@mygroup"}})
578+
* @Route("/api/myroute",options={"acl":{"@mygroup"}})
579579
*/
580580
```
581581

‎includes/YesWikiInit.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ public function initRoutes($wiki)
339339
new AnnotationReader()
340340
)
341341
);
342-
343342
// Core controllers
344343
$routes->addCollection($loader->load('includes/controllers'));
345344

‎includes/controllers/ApiController.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function getUser($userId)
133133
}
134134

135135
/**
136-
* @Route("/api/users/{userId}/delete",methods={"POST"}, options={"acl":{"public","@admins"}})
136+
* @Route("/api/users/{userId}/delete",methods={"POST"}, options={"acl":{"@admins"}})
137137
*/
138138
public function deleteUser($userId)
139139
{
@@ -183,7 +183,7 @@ public function deleteUser($userId)
183183
}
184184

185185
/**
186-
* @Route("/api/users",methods={"POST"}, options={"acl":{"public","@admins"}})
186+
* @Route("/api/users",methods={"POST"}, options={"acl":{"@admins"}})
187187
*/
188188
public function createUser()
189189
{
@@ -276,7 +276,7 @@ public function getAllUsers($userFields = ['name', 'email', 'signuptime'])
276276
}
277277

278278
/**
279-
* @Route("api/groups/{group_name}/delete",methods={"POST"},options={"acl":{"public","@admins"}})
279+
* @Route("api/groups/{group_name}/delete",methods={"POST"},options={"acl":{"@admins"}})
280280
*/
281281
public function deleteGroup(string $group_name)
282282
{
@@ -451,7 +451,7 @@ public function getAllComments($tag = '')
451451
}
452452

453453
/**
454-
* @Route("/api/comments",methods={"POST"}, options={"acl":{"public","+"}})
454+
* @Route("/api/comments",methods={"POST"}, options={"acl":{"+"}})
455455
*/
456456
public function postComment()
457457
{
@@ -462,7 +462,7 @@ public function postComment()
462462
}
463463

464464
/**
465-
* @Route("/api/comments/{tag}",methods={"POST"}, options={"acl":{"public","+"}})
465+
* @Route("/api/comments/{tag}",methods={"POST"}, options={"acl":{"+"}})
466466
*/
467467
public function editComment($tag)
468468
{
@@ -473,7 +473,7 @@ public function editComment($tag)
473473
}
474474

475475
/**
476-
* @Route("/api/comments/{tag}",methods={"DELETE"}, options={"acl":{"public","+"}})
476+
* @Route("/api/comments/{tag}",methods={"DELETE"}, options={"acl":{"+"}})
477477
*/
478478
public function deleteComment($tag)
479479
{
@@ -488,7 +488,7 @@ public function deleteComment($tag)
488488
}
489489

490490
/**
491-
* @Route("/api/comments/{tag}/delete",methods={"POST"}, options={"acl":{"public","+"}})
491+
* @Route("/api/comments/{tag}/delete",methods={"POST"}, options={"acl":{"+"}})
492492
*/
493493
public function deleteCommentViaPostMethod($tag)
494494
{
@@ -563,7 +563,7 @@ public function getPage(Request $request, $tag)
563563
}
564564

565565
/**
566-
* @Route("/api/pages/{tag}/duplicate",methods={"POST"},options={"acl":{"public","@admins"}})
566+
* @Route("/api/pages/{tag}/duplicate",methods={"POST"},options={"acl":{"@admins"}})
567567
*/
568568
public function duplicatePage(Request $request, $tag)
569569
{
@@ -579,7 +579,7 @@ public function duplicatePage(Request $request, $tag)
579579
}
580580

581581
/**
582-
* @Route("/api/pages/{tag}",methods={"DELETE"},options={"acl":{"public","+"}})
582+
* @Route("/api/pages/{tag}",methods={"DELETE"},options={"acl":{"+"}})
583583
*/
584584
public function deletePage($tag)
585585
{
@@ -635,7 +635,7 @@ public function deletePage($tag)
635635
}
636636

637637
/**
638-
* @Route("/api/pages/{tag}/delete",methods={"POST"},options={"acl":{"public","+"}})
638+
* @Route("/api/pages/{tag}/delete",methods={"POST"},options={"acl":{"+"}})
639639
*/
640640
public function deletePageByGetMethod($tag)
641641
{
@@ -700,7 +700,7 @@ public function getReactionsFromUser($userId, $id)
700700
}
701701

702702
/**
703-
* @Route("/api/reactions/{idreaction}/{id}/{page}/{username}", methods={"DELETE"}, options={"acl":{"public", "+"}})
703+
* @Route("/api/reactions/{idreaction}/{id}/{page}/{username}", methods={"DELETE"}, options={"acl":{"+"}})
704704
*/
705705
public function deleteReaction($idreaction, $id, $page, $username)
706706
{
@@ -738,15 +738,15 @@ public function deleteReaction($idreaction, $id, $page, $username)
738738
}
739739

740740
/**
741-
* @Route("/api/reactions/{idreaction}/{id}/{page}/{username}/delete",methods={"GET"},options={"acl":{"public","+"}})
741+
* @Route("/api/reactions/{idreaction}/{id}/{page}/{username}/delete",methods={"GET"},options={"acl":{"+"}})
742742
*/
743743
public function deleteReactionByGetMethod($idreaction, $id, $page, $username)
744744
{
745745
return $this->deleteReaction($idreaction, $id, $page, $username);
746746
}
747747

748748
/**
749-
* @Route("/api/reactions", methods={"POST"}, options={"acl":{"public", "+"}})
749+
* @Route("/api/reactions", methods={"POST"}, options={"acl":{"+"}})
750750
*/
751751
public function addReactionFromUser()
752752
{
@@ -823,7 +823,7 @@ public function addReactionFromUser()
823823
}
824824

825825
/**
826-
* @Route("/api/triples", methods={"GET"}, options={"acl":{"public", "+"}})
826+
* @Route("/api/triples", methods={"GET"}, options={"acl":{"+"}})
827827
*/
828828
public function ByResource()
829829
{
@@ -848,7 +848,7 @@ public function ByResource()
848848
}
849849

850850
/**
851-
* @Route("/api/triples/{resource}", methods={"GET"}, options={"acl":{"public", "+"}})
851+
* @Route("/api/triples/{resource}", methods={"GET"}, options={"acl":{"+"}})
852852
*/
853853
public function getTriplesByResource($resource)
854854
{
@@ -873,7 +873,7 @@ public function getTriplesByResource($resource)
873873
}
874874

875875
/**
876-
* @Route("/api/triples/{resource}", methods={"POST"}, options={"acl":{"public", "+"}})
876+
* @Route("/api/triples/{resource}", methods={"POST"}, options={"acl":{"+"}})
877877
*/
878878
public function setTriple($resource)
879879
{
@@ -920,7 +920,7 @@ public function setTriple($resource)
920920
}
921921

922922
/**
923-
* @Route("/api/triples/{resource}/delete", methods={"POST"}, options={"acl":{"public", "+"}})
923+
* @Route("/api/triples/{resource}/delete", methods={"POST"}, options={"acl":{"+"}})
924924
*/
925925
public function deleteTriples($resource)
926926
{
@@ -1045,15 +1045,15 @@ private function extractTriplesParams(string $method, $resource): array
10451045
}
10461046

10471047
/**
1048-
* @Route("/api/archives/{id}", methods={"GET"}, options={"acl":{"public", "@admins"}})
1048+
* @Route("/api/archives/{id}", methods={"GET"}, options={"acl":{"@admins"}})
10491049
*/
10501050
public function getArchive($id)
10511051
{
10521052
return $this->getService(ArchiveController::class)->getArchive($id);
10531053
}
10541054

10551055
/**
1056-
* @Route("/api/archives/uidstatus/{uid}", methods={"GET"}, options={"acl":{"public", "@admins"}})
1056+
* @Route("/api/archives/uidstatus/{uid}", methods={"GET"}, options={"acl":{"@admins"}})
10571057
*/
10581058
public function getArchiveStatus($uid)
10591059
{
@@ -1064,7 +1064,7 @@ public function getArchiveStatus($uid)
10641064
}
10651065

10661066
/**
1067-
* @Route("/api/archives/archivingStatus/", methods={"GET"}, options={"acl":{"public", "@admins"}})
1067+
* @Route("/api/archives/archivingStatus/", methods={"GET"}, options={"acl":{"@admins"}})
10681068
*/
10691069
public function getArchivingStatus()
10701070
{
@@ -1075,7 +1075,7 @@ public function getArchivingStatus()
10751075
}
10761076

10771077
/**
1078-
* @Route("/api/archives/forcedUpdateToken/", methods={"GET"}, options={"acl":{"public", "@admins"}})
1078+
* @Route("/api/archives/forcedUpdateToken/", methods={"GET"}, options={"acl":{"@admins"}})
10791079
*/
10801080
public function getForcedUpdateToken()
10811081
{
@@ -1088,8 +1088,8 @@ public function getForcedUpdateToken()
10881088
}
10891089

10901090
/**
1091-
* @Route("/api/archives/", methods={"GET"}, options={"acl":{"public", "@admins"}})
1092-
* @Route("/api/archives", methods={"GET"}, options={"acl":{"public", "@admins"}})
1091+
* @Route("/api/archives/", methods={"GET"}, options={"acl":{"@admins"}})
1092+
* @Route("/api/archives", methods={"GET"}, options={"acl":{"@admins"}})
10931093
*/
10941094
public function getArchives()
10951095
{
@@ -1102,15 +1102,15 @@ public function getArchives()
11021102
}
11031103

11041104
/**
1105-
* @Route("/api/archives/{id}", methods={"POST"}, options={"acl":{"public", "@admins"}})
1105+
* @Route("/api/archives/{id}", methods={"POST"}, options={"acl":{"@admins"}})
11061106
*/
11071107
public function archiveAction($id)
11081108
{
11091109
return $this->getService(ArchiveController::class)->manageArchiveAction($id);
11101110
}
11111111

11121112
/**
1113-
* @Route("/api/archives", methods={"POST"}, options={"acl":{"public", "@admins"}})
1113+
* @Route("/api/archives", methods={"POST"}, options={"acl":{"@admins"}})
11141114
*/
11151115
public function archivesAction()
11161116
{

‎tools/templates/controllers/ApiController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
class ApiController extends YesWikiController
1111
{
1212
/**
13-
* @Route("/api/templates/custom-presets/{presetFilename}", methods={"DELETE"},options={"acl":{"public","@admins"}})
13+
* @Route("/api/templates/custom-presets/{presetFilename}", methods={"DELETE"},options={"acl":{"@admins"}})
1414
*/
1515
public function deleteCustomCSSPreset($presetFilename)
1616
{
@@ -23,7 +23,7 @@ public function deleteCustomCSSPreset($presetFilename)
2323
}
2424

2525
/**
26-
* @Route("/api/templates/custom-presets/{presetFilename}", methods={"POST"},options={"acl":{"public","+"}})
26+
* @Route("/api/templates/custom-presets/{presetFilename}", methods={"POST"},options={"acl":{"+"}})
2727
*/
2828
public function addCustomCSSPreset($presetFilename)
2929
{

0 commit comments

Comments
 (0)