Skip to content

Commit ce9409d

Browse files
committed
use unauthorized function, don't print anything to use
1 parent dc29a00 commit ce9409d

File tree

11 files changed

+18
-13
lines changed

11 files changed

+18
-13
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ repos:
4848
language: system
4949
files: \.php$
5050
args: [-l]
51-
- repo: local
52-
hooks:
5351
- id: assert-no-die-exit
5452
name: Assert no die()/exit()
5553
entry: ./test/assert-no-die-exit.bash
5654
language: system
5755
files: \.php$
58-
exclude: \./resources/lib/UnitySite.php$
56+
exclude: resources/lib/UnitySite\.php$

resources/lib/UnitySite.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,14 @@ public static function badRequest($message)
5050
{
5151
self::headerResponseCode(400);
5252
self::errorLog("bad request", $message);
53-
self::die($message);
53+
self::die();
54+
}
55+
56+
public static function unauthorized($message)
57+
{
58+
self::headerResponseCode(401);
59+
self::errorLog("unauthorized", $message);
60+
self::die();
5461
}
5562

5663
public static function removeTrailingWhitespace($arr)

webroot/admin/ajax/get_group_members.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use UnityWebPortal\lib\UnitySite;
77

88
if (!$USER->isAdmin()) {
9-
UnitySite::die();
9+
UnitySite::unauthorized("not an admin");
1010
}
1111

1212
if (!isset($_GET["pi_uid"])) {

webroot/admin/ajax/get_page_contents.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use UnityWebPortal\lib\UnitySite;
66

77
if (!$USER->isAdmin()) {
8-
UnitySite::die();
8+
UnitySite::unauthorized("not an admin");
99
}
1010

1111
if (!isset($_GET["pageid"])) {

webroot/admin/content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use UnityWebPortal\lib\UnitySite;
66

77
if (!$USER->isAdmin()) {
8-
UnitySite::die();
8+
UnitySite::unauthorized("not an admin");
99
}
1010

1111
if ($_SERVER["REQUEST_METHOD"] == "POST") {

webroot/admin/notices.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use UnityWebPortal\lib\UnitySite;
66

77
if (!$USER->isAdmin()) {
8-
UnitySite::die();
8+
UnitySite::unauthorized("not an admin");
99
}
1010

1111
if ($_SERVER["REQUEST_METHOD"] == "POST") {

webroot/admin/pi-mgmt.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use UnityWebPortal\lib\UnitySite;
88

99
if (!$USER->isAdmin()) {
10-
UnitySite::die();
10+
UnitySite::unauthorized("not an admin");
1111
}
1212

1313
if ($_SERVER["REQUEST_METHOD"] == "POST") {

webroot/admin/user-mgmt.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use UnityWebPortal\lib\UnitySite;
66

77
if (!$USER->isAdmin()) {
8-
UnitySite::die();
8+
UnitySite::unauthorized("not an admin");
99
}
1010

1111
if ($_SERVER["REQUEST_METHOD"] == "POST") {

webroot/panel/ajax/get_group_members.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222

2323
if ($found) {
24-
UnitySite::die("not a group member");
24+
UnitySite::unauthorized("not a group member");
2525
}
2626

2727
$count = count($members);

webroot/panel/modal/pi_search.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
$search_query = $_GET["search"]; // Search is passed as a get var
88
if (empty($search_query)) {
99
echo "<span>No Results</span>";
10-
UnitySite::die("no results");
10+
UnitySite::die();
1111
}
1212

1313
$assocs = $LDAP->getAllPIGroups($SQL, $MAILER, $REDIS, $WEBHOOK);

0 commit comments

Comments
 (0)