Merge pull request #1495 from tweag/remove-legacypasswd

Remove legacypasswd

Author: gbaz

datafiles/templates/AdminFrontend/account.html.st

@@ -17,7 +17,6 @@ $hackagePageHeader()$
   <tr><td>Username:<td>$account.name$
   <tr><td>User ID:<td>$account.id$
   <tr><td><a href="#account-status">Status:</a><td>$account.status$
-  <tr><td><a href="#passwd-legacy">Legacy password:</a><td>$if(hasLegacyPassword)$<strong>Yes</strong>$else$No$endif$
   <tr><td><a href="#edit-details">Real name:</a><td>$details.realname$
   <tr><td><a href="#edit-details">Email:</a><td>$details.email$
   <tr><td><a href="#edit-details">Account type:</a><td>$details.kind$
@@ -151,36 +150,6 @@ Alternatively, as an administrator you can set account passwords directly.
   <p><input type="submit" value="Change password" /></p>
 </form>
 
-<h2 id="passwd-legacy">Legacy password</h2>
-
-<p>Legacy passwords are to enable a relatively smooth upgrade from
-<a href="/users/htpasswd-upgrade">old "htpasswd" style passwords</a>.
-</p>
-
-$if(hasLegacyPassword)$
-$if(!account.hasAuth)$
-<p>This account has a legacy "htpasswd" password set, and no new password set.
-It can be upgraded by the user that knows the old password. Alternatively
-you can simply delete the legacy "htpasswd" and set a new password.
-</p>
-$else$
-<p>This account has a new password set <em>but still has an legacy "htpasswd" password
-too</em>. The legacy one can safely be deleted. Indeed it is better to delete it as
-it otherwise prevents the account from being disabled should the need arise
-(the account could be reactivated by anyone knowing the legacy "htpasswd".)
-</p>
-$endif$
-<form class="box" action="/user/$account.name$/htpasswd" method="post" enctype="multipart/form-data">
-  <input type="hidden" name="_method" value="DELETE"/>
-  <input type="hidden" name="_return" value="/admin/account/$account.id$"/>
-
-  <button type="submit">Delete legacy password</button>
-</form>
-$else$
-<p>This account has no legacy password.
-</p>
-$endif$
-
 <h2 id="edit-details">Edit account details</h2>
 
 <form class="box" action="/user/$account.name$/name-contact" method="post" enctype="multipart/form-data">

datafiles/templates/LegacyPasswds/htpasswd-upgrade-success.html.st

@@ -336,10 +336,6 @@ library
       Distribution.Server.Features.TarIndexCache
       Distribution.Server.Features.TarIndexCache.State
       Distribution.Server.Features.LegacyRedirects
-      Distribution.Server.Features.LegacyPasswds
-      Distribution.Server.Features.LegacyPasswds.Acid
-      Distribution.Server.Features.LegacyPasswds.Auth
-      Distribution.Server.Features.LegacyPasswds.Backup
       Distribution.Server.Features.PackageContents
       Distribution.Server.Features.AdminFrontend
       Distribution.Server.Features.AdminLog

datafiles/templates/LegacyPasswds/htpasswd-upgrade.html.st

@@ -42,7 +42,6 @@ import Distribution.Server.Features.PackageList         (initListFeature)
 import Distribution.Server.Features.HaskellPlatform     (initPlatformFeature)
 import Distribution.Server.Features.UserDetails         (initUserDetailsFeature)
 import Distribution.Server.Features.UserSignup          (initUserSignupFeature)
-import Distribution.Server.Features.LegacyPasswds       (initLegacyPasswdsFeature)
 import Distribution.Server.Features.EditCabalFiles      (initEditCabalFilesFeature)
 import Distribution.Server.Features.AdminFrontend       (initAdminFrontendFeature)
 import Distribution.Server.Features.AdminLog            (initAdminLogFeature)
@@ -112,8 +111,6 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
                               initUserDetailsFeature env
     mkUserSignupFeature    <- logStartup "user signup" $
                               initUserSignupFeature env
-    mkLegacyPasswdsFeature <- logStartup "legacy passwords" $
-                              initLegacyPasswdsFeature env
     mkDistroFeature        <- logStartup "distro" $
                               initDistroFeature env
     mkPackageCandidatesFeature       <- logStartup "package candidates" $
@@ -130,7 +127,7 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
                                initDownloadFeature env
     mkTagsFeature           <- logStartup "tags" $
                                initTagsFeature env
-    mkAnalyticsPixelsFeature <- logStartup "analytics pixels" $ 
+    mkAnalyticsPixelsFeature <- logStartup "analytics pixels" $
                                initAnalyticsPixelsFeature env
     mkVersionsFeature       <- logStartup "versions" $
                                initVersionsFeature env
@@ -213,9 +210,6 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
                            userDetailsFeature
                            uploadFeature
 
-    legacyPasswdsFeature <- mkLegacyPasswdsFeature
-                              usersFeature
-
     distroFeature   <- mkDistroFeature
                          usersFeature
                          coreFeature
@@ -320,7 +314,7 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
                          reportsCoreFeature
                          userDetailsFeature
                          recentPackagesFeature
-                         
+
 
     editCabalFeature <- mkEditCabalFilesFeature
                           usersFeature
@@ -331,7 +325,6 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
                               usersFeature
                               userDetailsFeature
                               userSignupFeature
-                              legacyPasswdsFeature
 
     hoogleDataFeature <- mkHoogleDataFeature
                            coreFeature
@@ -398,7 +391,6 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
          , getFeatureInterface recentPackagesFeature
          , getFeatureInterface userDetailsFeature
          , getFeatureInterface userSignupFeature
-         , getFeatureInterface legacyPasswdsFeature
          , getFeatureInterface distroFeature
          , getFeatureInterface candidatesFeature
          , getFeatureInterface reportsCoreFeature

hackage-server.cabal

@@ -13,8 +13,6 @@ import Distribution.Server.Features.Users
 import Distribution.Server.Features.UserDetails
 import Distribution.Server.Features.UserDetails.Types
 import Distribution.Server.Features.UserSignup
-import Distribution.Server.Features.LegacyPasswds
-import qualified Distribution.Server.Features.LegacyPasswds.Acid as Acid
 
 import Distribution.Server.Users.Types
 import qualified Distribution.Server.Users.Users as Users
@@ -33,20 +31,19 @@ initAdminFrontendFeature :: ServerEnv
                          -> IO (UserFeature
                              -> UserDetailsFeature
                              -> UserSignupFeature
-                             -> LegacyPasswdsFeature
                              -> IO HackageFeature)
 initAdminFrontendFeature env@ServerEnv{ serverTemplatesDir,
                                         serverTemplatesMode } = do
     -- Page templates
     templates <- loadTemplates serverTemplatesMode
                    [serverTemplatesDir, serverTemplatesDir </> "AdminFrontend"]
                    [ "admin.html", "accounts.html", "account.html"
-                   , "signups.html", "resets.html", "legacy.html" ]
+                   , "signups.html", "resets.html" ]
 
-    return $ \user userdetails usersignup legacypasswds -> do
+    return $ \user userdetails usersignup -> do
       let feature = adminFrontendFeature env templates
                                          user userdetails
-                                         usersignup legacypasswds
+                                         usersignup
 
       return feature
 
@@ -55,19 +52,17 @@ adminFrontendFeature :: ServerEnv -> Templates
                      -> UserFeature
                      -> UserDetailsFeature
                      -> UserSignupFeature
-                     -> LegacyPasswdsFeature
                      -> HackageFeature
 adminFrontendFeature _env templates
                      UserFeature{..} UserDetailsFeature{..}
-                     UserSignupFeature{..} LegacyPasswdsFeature{..} =
+                     UserSignupFeature{..} =
   (emptyHackageFeature "admin-frontend") {
     featureResources =
       [ adminPortalResource
       , adminAccountsResource
       , adminAccountResource
       , adminSignupsResource
       , adminResetsResource
-      , adminLegacyResource
       ]
   , featureState = []
   , featureReloadFiles = reloadTemplates templates
@@ -99,11 +94,6 @@ adminFrontendFeature _env templates
         resourceDesc = [(GET,  "All password reset requests")],
         resourceGet  = [("html", serveAdminResetsGet)]
       }
-    adminLegacyResource =
-      (resourceAt "/admin/legacy")  {
-        resourceDesc = [(GET,  "All accounts with legacy passwords")],
-        resourceGet  = [("html", serveAdminLegacyGet)]
-      }
 
     serveAdminPortalGet :: DynamicPath -> ServerPartE Response
     serveAdminPortalGet _ = do
@@ -198,20 +188,6 @@ adminFrontendFeature _env templates
                         ]
           ]
 
-    serveAdminLegacyGet :: DynamicPath -> ServerPartE Response
-    serveAdminLegacyGet _ = do
-        guardAuthorised_ [InGroup adminGroup]
-        cacheControlWithoutETag [Private]
-        template     <- getTemplate templates "legacy.html"
-        usersdb      <- queryGetUserDb
-        legacyUsers  <- Acid.enumerateAllUserLegacyPasswd <$> queryLegacyPasswds
-        ok $ toResponse $ template
-          [ "accounts" $= [ accountBasicInfoToTemplate uid uinfo
-                          | uid <- legacyUsers
-                          , let Just uinfo = Users.lookupUserId uid usersdb
-                          ]
-          ]
-
     resetRequestToTemplate :: SignupResetInfo -> UserInfo -> TemplateVal
     resetRequestToTemplate ResetInfo {nonceTimestamp, resetUserId} uinfo =
       templateDict
@@ -229,13 +205,11 @@ adminFrontendFeature _env templates
         uinfo     <- lookupUserInfo uid
         mudetails <- queryUserDetails uid
         resetInfo <- lookupPasswordReset uid <$> queryAllSignupResetInfo
-        mlegacy   <- Acid.lookupUserLegacyPasswd uid <$> queryLegacyPasswds
 
         ok $ toResponse $ template
           [ "account" $= accountBasicInfoToTemplate uid uinfo
           , "details" $= accountDetailsToTemplate uinfo mudetails
           , "resetRequests"     $= resetInfo
-          , "hasLegacyPassword" $= isJust mlegacy
           ]
       where
         lookupPasswordReset uid allResetInfo =