From 8318a0b6407a1e76ebe09f3cd9a4349382235319 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 30 Sep 2020 11:14:01 +0200 Subject: [PATCH] Move ExAuth, FKOAuth1 & FKOAuthDataStore to own namespace `Friendica\Security` --- bin/auth_ejabberd.php | 2 +- library/OAuth1.php | 2 +- mod/item.php | 2 +- mod/photos.php | 2 +- mod/videos.php | 2 +- src/Model/Attach.php | 2 +- src/Model/Photo.php | 2 +- src/Module/Profile/Status.php | 2 +- src/Object/Thread.php | 2 +- src/{Util => Security}/ExAuth.php | 3 ++- src/{Network => Security}/FKOAuth1.php | 1 + src/{Network => Security}/FKOAuthDataStore.php | 2 +- src/{Util => Security}/Security.php | 2 +- 13 files changed, 14 insertions(+), 12 deletions(-) rename src/{Util => Security}/ExAuth.php (99%) rename src/{Network => Security}/FKOAuth1.php (97%) rename src/{Network => Security}/FKOAuthDataStore.php (99%) rename src/{Util => Security}/Security.php (99%) diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php index e921829163..d6e20dfe15 100755 --- a/bin/auth_ejabberd.php +++ b/bin/auth_ejabberd.php @@ -58,7 +58,7 @@ if (php_sapi_name() !== 'cli') { use Dice\Dice; use Friendica\App\Mode; -use Friendica\Util\ExAuth; +use Friendica\Security\ExAuth; use Psr\Log\LoggerInterface; if (sizeof($_SERVER["argv"]) == 0) { diff --git a/library/OAuth1.php b/library/OAuth1.php index 813234b67b..05ec5aa755 100644 --- a/library/OAuth1.php +++ b/library/OAuth1.php @@ -4,7 +4,7 @@ /* Generic exception class */ -use Friendica\Network\FKOAuthDataStore; +use Friendica\Security\FKOAuthDataStore; if (!class_exists('OAuthException', false)) { class OAuthException extends Exception diff --git a/mod/item.php b/mod/item.php index 17f6486f89..b77e725756 100644 --- a/mod/item.php +++ b/mod/item.php @@ -54,7 +54,7 @@ use Friendica\Object\EMail\ItemCCEMail; use Friendica\Protocol\Activity; use Friendica\Protocol\Diaspora; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Security; +use Friendica\Security\Security; use Friendica\Util\Strings; use Friendica\Worker\Delivery; diff --git a/mod/photos.php b/mod/photos.php index 3b2fa0c3a8..bba12aaceb 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -47,7 +47,7 @@ use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; use Friendica\Util\Images; use Friendica\Util\Map; -use Friendica\Util\Security; +use Friendica\Security\Security; use Friendica\Util\Strings; use Friendica\Util\Temporal; use Friendica\Util\XML; diff --git a/mod/videos.php b/mod/videos.php index 3dd17179ae..1ba566eeaa 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -33,7 +33,7 @@ use Friendica\Model\Item; use Friendica\Model\Profile; use Friendica\Model\User; use Friendica\Module\BaseProfile; -use Friendica\Util\Security; +use Friendica\Security\Security; function videos_init(App $a) { diff --git a/src/Model/Attach.php b/src/Model/Attach.php index ad587e68bd..b81c38762e 100644 --- a/src/Model/Attach.php +++ b/src/Model/Attach.php @@ -28,7 +28,7 @@ use Friendica\DI; use Friendica\Object\Image; use Friendica\Util\DateTimeFormat; use Friendica\Util\Mimetype; -use Friendica\Util\Security; +use Friendica\Security\Security; /** * Class to handle attach dabatase table diff --git a/src/Model/Photo.php b/src/Model/Photo.php index f09e88ce7d..6380f42789 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -31,7 +31,7 @@ use Friendica\Model\Storage\SystemResource; use Friendica\Object\Image; use Friendica\Util\DateTimeFormat; use Friendica\Util\Images; -use Friendica\Util\Security; +use Friendica\Security\Security; use Friendica\Util\Strings; require_once "include/dba.php"; diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php index 421c8acccd..fbc287e6a8 100644 --- a/src/Module/Profile/Status.php +++ b/src/Module/Profile/Status.php @@ -36,7 +36,7 @@ use Friendica\Module\BaseProfile; use Friendica\Module\Security\Login; use Friendica\Network\HTTPException; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Security; +use Friendica\Security\Security; use Friendica\Util\Strings; use Friendica\Util\XML; diff --git a/src/Object/Thread.php b/src/Object/Thread.php index f62b14c71e..6b31ad7049 100644 --- a/src/Object/Thread.php +++ b/src/Object/Thread.php @@ -25,7 +25,7 @@ use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\DI; use Friendica\Protocol\Activity; -use Friendica\Util\Security; +use Friendica\Security\Security; /** * A list of threads diff --git a/src/Util/ExAuth.php b/src/Security/ExAuth.php similarity index 99% rename from src/Util/ExAuth.php rename to src/Security/ExAuth.php index 7771712f31..87f236d4ec 100644 --- a/src/Util/ExAuth.php +++ b/src/Security/ExAuth.php @@ -32,7 +32,7 @@ * */ -namespace Friendica\Util; +namespace Friendica\Security; use Exception; use Friendica\App; @@ -42,6 +42,7 @@ use Friendica\Database\Database; use Friendica\DI; use Friendica\Model\User; use Friendica\Network\HTTPException; +use Friendica\Util\PidFile; class ExAuth { diff --git a/src/Network/FKOAuth1.php b/src/Security/FKOAuth1.php similarity index 97% rename from src/Network/FKOAuth1.php rename to src/Security/FKOAuth1.php index 9833d5e0af..48f8a54b16 100644 --- a/src/Network/FKOAuth1.php +++ b/src/Security/FKOAuth1.php @@ -24,6 +24,7 @@ namespace Friendica\Network; use Friendica\Core\Logger; use Friendica\Database\DBA; use Friendica\DI; +use Friendica\Security\FKOAuthDataStore; use OAuthServer; use OAuthSignatureMethod_HMAC_SHA1; use OAuthSignatureMethod_PLAINTEXT; diff --git a/src/Network/FKOAuthDataStore.php b/src/Security/FKOAuthDataStore.php similarity index 99% rename from src/Network/FKOAuthDataStore.php rename to src/Security/FKOAuthDataStore.php index ee9a709152..d9c6895efb 100644 --- a/src/Network/FKOAuthDataStore.php +++ b/src/Security/FKOAuthDataStore.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Network; +namespace Friendica\Security; use Friendica\Core\Logger; use Friendica\Database\DBA; diff --git a/src/Util/Security.php b/src/Security/Security.php similarity index 99% rename from src/Util/Security.php rename to src/Security/Security.php index 4233382160..a75b9168b5 100644 --- a/src/Util/Security.php +++ b/src/Security/Security.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Util; +namespace Friendica\Security; use Friendica\Database\DBA; use Friendica\Model\Contact;