From 7c9f63955a5b7cece6926884e6dfd154c87e97fc Mon Sep 17 00:00:00 2001 From: netkas Date: Fri, 13 Sep 2024 13:26:54 -0400 Subject: [PATCH] Update Scopes to enum and adjust scope checks --- src/ncc/CLI/Management/ConfigMenu.php | 2 +- src/ncc/CLI/Management/CredentialMenu.php | 4 ++-- src/ncc/CLI/Management/PackageManagerMenu.php | 8 ++++---- src/ncc/CLI/Management/ProjectMenu.php | 2 +- src/ncc/CLI/Management/RepositoryMenu.php | 4 ++-- src/ncc/Enums/Scopes.php | 6 +++--- src/ncc/Managers/ConfigurationManager.php | 2 +- src/ncc/Managers/CredentialManager.php | 6 +++--- src/ncc/Managers/PackageLockManager.php | 4 ++-- src/ncc/Managers/PackageManager.php | 6 +++--- src/ncc/Managers/ProjectManager.php | 2 +- src/ncc/Managers/RepositoryManager.php | 8 ++++---- src/ncc/Utilities/Functions.php | 4 ++-- src/ncc/Utilities/Resolver.php | 4 ++-- src/ncc/Utilities/Validate.php | 4 ++-- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/ncc/CLI/Management/ConfigMenu.php b/src/ncc/CLI/Management/ConfigMenu.php index e28ab88..87a9c43 100644 --- a/src/ncc/CLI/Management/ConfigMenu.php +++ b/src/ncc/CLI/Management/ConfigMenu.php @@ -101,7 +101,7 @@ if(isset($args['v'])) { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { Console::outError('Insufficient permissions, cannot modify configuration values', true, 1); return 1; diff --git a/src/ncc/CLI/Management/CredentialMenu.php b/src/ncc/CLI/Management/CredentialMenu.php index 1253c0d..6a9caee 100644 --- a/src/ncc/CLI/Management/CredentialMenu.php +++ b/src/ncc/CLI/Management/CredentialMenu.php @@ -187,7 +187,7 @@ { $ResolvedScope = Resolver::resolveScope(); - if($ResolvedScope !== Scopes::SYSTEM) + if($ResolvedScope !== Scopes::SYSTEM->value) { Console::outError('Insufficient permissions to add entries'); } @@ -313,7 +313,7 @@ { $ResolvedScope = Resolver::resolveScope(); - if($ResolvedScope !== Scopes::SYSTEM) + if($ResolvedScope !== Scopes::SYSTEM->value) { Console::outError('Insufficient permissions to remove entries'); } diff --git a/src/ncc/CLI/Management/PackageManagerMenu.php b/src/ncc/CLI/Management/PackageManagerMenu.php index 8af6710..a3bd820 100644 --- a/src/ncc/CLI/Management/PackageManagerMenu.php +++ b/src/ncc/CLI/Management/PackageManagerMenu.php @@ -132,7 +132,7 @@ */ private static function installPackage(array $args): int { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { Console::outError('You cannot install packages in a user scope, please run this command as root', true, 1); return 1; @@ -388,7 +388,7 @@ */ private static function uninstallPackage($args): int { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { Console::outError('You cannot uninstall packages in a user scope, please run this command as root', true, 1); return 1; @@ -419,7 +419,7 @@ */ private static function uninstallAllPackages(array $args): int { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { Console::outError('You cannot uninstall all packages in a user scope, please run this command as root', true, 1); return 1; @@ -455,7 +455,7 @@ */ private static function fixBrokenPackages(array $args): int { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { Console::outError('You cannot fix broken packages in a user scope, please run this command as root', true, 1); return 1; diff --git a/src/ncc/CLI/Management/ProjectMenu.php b/src/ncc/CLI/Management/ProjectMenu.php index 73fe108..a1562bf 100644 --- a/src/ncc/CLI/Management/ProjectMenu.php +++ b/src/ncc/CLI/Management/ProjectMenu.php @@ -134,7 +134,7 @@ */ private static function installProject(array $args): int { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { Console::outError('You cannot install packages in a user scope, please run this command as root', true, 1); return 1; diff --git a/src/ncc/CLI/Management/RepositoryMenu.php b/src/ncc/CLI/Management/RepositoryMenu.php index 2ce5411..033e844 100644 --- a/src/ncc/CLI/Management/RepositoryMenu.php +++ b/src/ncc/CLI/Management/RepositoryMenu.php @@ -141,7 +141,7 @@ */ private static function addEntry(array $args): int { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { Console::outError('You must be running as root to add a new repository', true, 1); return 1; @@ -230,7 +230,7 @@ */ private static function removeEntry(array $args): int { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { Console::outError('You must be running as root to remove a repository', true, 1); return 1; diff --git a/src/ncc/Enums/Scopes.php b/src/ncc/Enums/Scopes.php index a668670..efae5ee 100644 --- a/src/ncc/Enums/Scopes.php +++ b/src/ncc/Enums/Scopes.php @@ -22,9 +22,9 @@ namespace ncc\Enums; - final class Scopes + enum Scopes : string { - public const USER = 'USER'; + case USER = 'USER'; - public const SYSTEM = 'SYSTEM'; + case SYSTEM = 'SYSTEM'; } \ No newline at end of file diff --git a/src/ncc/Managers/ConfigurationManager.php b/src/ncc/Managers/ConfigurationManager.php index 451dd18..e33efc9 100644 --- a/src/ncc/Managers/ConfigurationManager.php +++ b/src/ncc/Managers/ConfigurationManager.php @@ -89,7 +89,7 @@ { Console::outDebug(sprintf('saving configuration file to %s', PathFinder::getConfigurationFile())); - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new AuthenticationException('Cannot save configuration file, insufficient permissions'); } diff --git a/src/ncc/Managers/CredentialManager.php b/src/ncc/Managers/CredentialManager.php index d2d54fc..146472e 100644 --- a/src/ncc/Managers/CredentialManager.php +++ b/src/ncc/Managers/CredentialManager.php @@ -51,7 +51,7 @@ */ public function __construct() { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must have root privileges to access the credentials storage file'); } @@ -86,7 +86,7 @@ { Console::outVerbose(sprintf('Saving credentials store to %s', PathFinder::getCredentialStorage())); - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must have root privileges to modify the credentials storage file'); } @@ -103,7 +103,7 @@ */ public static function initializeCredentialStorage(): void { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must have root privileges to initialize the credentials storage file'); } diff --git a/src/ncc/Managers/PackageLockManager.php b/src/ncc/Managers/PackageLockManager.php index 9b6c708..1bae518 100644 --- a/src/ncc/Managers/PackageLockManager.php +++ b/src/ncc/Managers/PackageLockManager.php @@ -80,7 +80,7 @@ */ public function save(): void { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must be running as root to update the system package lock'); } @@ -98,7 +98,7 @@ */ public static function initializePackageLock(): void { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must be running as root to update the system package lock'); } diff --git a/src/ncc/Managers/PackageManager.php b/src/ncc/Managers/PackageManager.php index 375d6bd..9ba157b 100644 --- a/src/ncc/Managers/PackageManager.php +++ b/src/ncc/Managers/PackageManager.php @@ -151,7 +151,7 @@ */ public function install(string|PackageReader $input, ?AuthenticationInterface $authentication=null, array $options=[]): array { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must have root privileges to install packages'); } @@ -188,7 +188,7 @@ */ public function uninstall(string $package_name, ?string $version=null): array { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must have root privileges to uninstall packages'); } @@ -285,7 +285,7 @@ */ public function uninstallAll(): array { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must have root privileges to uninstall packages'); } diff --git a/src/ncc/Managers/ProjectManager.php b/src/ncc/Managers/ProjectManager.php index 6e55750..b611ff8 100644 --- a/src/ncc/Managers/ProjectManager.php +++ b/src/ncc/Managers/ProjectManager.php @@ -211,7 +211,7 @@ */ public function installDependencies(?AuthenticationInterface $authentication=null): array { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('Unable to install dependencies, you must be running as root'); } diff --git a/src/ncc/Managers/RepositoryManager.php b/src/ncc/Managers/RepositoryManager.php index 408b95b..d70e4cb 100644 --- a/src/ncc/Managers/RepositoryManager.php +++ b/src/ncc/Managers/RepositoryManager.php @@ -109,7 +109,7 @@ */ public function addRepository(RepositoryConfiguration $source, bool $update=true): void { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must be running as root to add a new repository'); } @@ -160,7 +160,7 @@ */ public function removeRepository(string $name, bool $update=true): void { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must be running as root to delete a repository'); } @@ -195,7 +195,7 @@ */ public function updateDatabase(): void { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must be running as root to update the repository database'); } @@ -221,7 +221,7 @@ */ public static function initializeDatabase(array $default_repositories=[]): void { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must be running as root to initialize the repository database'); } diff --git a/src/ncc/Utilities/Functions.php b/src/ncc/Utilities/Functions.php index 2f04a82..27581f7 100644 --- a/src/ncc/Utilities/Functions.php +++ b/src/ncc/Utilities/Functions.php @@ -293,7 +293,7 @@ */ public static function initializeFiles(?string $install_path=null, array $default_repositories=[]): void { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { throw new OperationException('You must be running as root to initialize ncc files'); } @@ -523,7 +523,7 @@ */ public static function finalizePermissions(): void { - if(Resolver::resolveScope() !== Scopes::SYSTEM) + if(Resolver::resolveScope() !== Scopes::SYSTEM->value) { return; } diff --git a/src/ncc/Utilities/Resolver.php b/src/ncc/Utilities/Resolver.php index f58f0e9..2c63853 100644 --- a/src/ncc/Utilities/Resolver.php +++ b/src/ncc/Utilities/Resolver.php @@ -56,10 +56,10 @@ if(self::$user_id_cache === 0) { - return Scopes::SYSTEM; + return Scopes::SYSTEM->value; } - return Scopes::USER; + return Scopes::USER->value; } /** diff --git a/src/ncc/Utilities/Validate.php b/src/ncc/Utilities/Validate.php index 0d7d540..b661aae 100644 --- a/src/ncc/Utilities/Validate.php +++ b/src/ncc/Utilities/Validate.php @@ -111,8 +111,8 @@ namespace ncc\Utilities; switch($input) { - case Scopes::SYSTEM: - case Scopes::USER: + case Scopes::SYSTEM->value: + case Scopes::USER->value: return true; default: