Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-03-26 10:21:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

move insert auth admin to pkg check

Browse Source
This commit is contained in:
Lucy Cifferello
2024-04-15 19:20:25 -04:00
parent 6b854feaef
commit a9d78fa490
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Handler/Admin.hs
View File

@@ -162,10 +162,13 @@ postCheckPkgAuthR pkgId = do
Just name -> do
if ((length whitelist > 0 && (pkgId `elem` whitelist)) || length whitelist <= 0)
then do
(authorized, _) <- checkAdminAllowedPkgs pkgId name
if authorized
(authorized, newPkg) <- checkAdminAllowedPkgs pkgId name
if authorized && not newPkg
then sendResponseText status200 "User authorized to upload this package."
else sendResponseText status401 "User not authorized to upload this package."
else if authorized && newPkg
-- if pkg is whitelisted and a new upload, add as authorized for this admin user
then runDB $ insert_ (AdminPkgs (AdminKey name) (PkgRecordKey pkgId))
else sendResponseText status401 "User not authorized to upload this package."
else sendResponseText status500 "Package does not belong on this registry."
postPkgUploadR :: Handler ()
@@ -198,15 +201,11 @@ postPkgUploadR = do
"Impossible: an unauthenticated user has managed to upload a pacakge to this registry."
pure ()
Just name -> do
(authorized, newPkg) <- checkAdminAllowedPkgs packageManifestId name
(authorized, _) <- checkAdminAllowedPkgs packageManifestId name
if authorized
then do
now <- liftIO getCurrentTime
runDB $ insert_ (Upload (AdminKey name) (PkgRecordKey packageManifestId) packageManifestVersion now)
-- if pkg is whitelisted and a new upload, add as authorized for this admin user
if (newPkg)
then runDB $ insert_ (AdminPkgs (AdminKey name) (PkgRecordKey packageManifestId))
else pure ()
else sendResponseText status401 "User not authorized to upload this package."
else sendResponseText status500 "Package does not belong on this registry."
where