refactoring

Backend.hs

@@ -10,13 +10,14 @@
 module Backend (
 	builtinList,
 	defaultBackend,
-	defaultHashBackend,
+	hashBackend,
 	genKey,
 	getBackend,
 	chooseBackend,
 	lookupBackendVariety,
 	lookupBuiltinBackendVariety,
 	maybeLookupBackendVariety,
+	unknownBackendVarietyMessage,
 	isStableKey,
 	isCryptographicallySecureKey,
 	isCryptographicallySecure,
@@ -54,6 +55,15 @@ defaultBackend = maybe cache return =<< Annex.getState Annex.backend
 	valid name = not (null name)
 	lookupname = lookupBackendVariety . parseKeyVariety . encodeBS
 
+{- A hashing backend. Takes git config into account, but
+ - guarantees the backend is cryptographically secure. -}
+hashBackend :: Annex Backend
+hashBackend = do
+	db <- defaultBackend
+	return $ if isCryptographicallySecure db
+		then db
+		else defaultHashBackend
+
 {- Generates a key for a file. -}
 genKey :: KeySource -> MeterUpdate -> Backend -> Annex (Key, Backend)
 genKey source meterupdate b = case B.genKey b of

Backend/VURL/Utilities.hs

@@ -56,3 +56,11 @@ generateEquivilantKey b f =
 		, contentLocation = f
 		, inodeCache = Nothing
 		}
+
+recordVurlKey :: Backend -> OsPath -> Key -> [Key] -> Annex Bool
+recordVurlKey b f key eks = generateEquivilantKey b f >>= \case
+	Nothing -> return False
+	Just ek -> do
+		unless (ek `elem` eks) $
+			setEquivilantKey key ek
+		return True

Remote/Web.hs

@@ -30,7 +30,7 @@ import Annex.SpecialRemote.Config
 import Logs.Remote
 import Logs.EquivilantKeys
 import Backend
-import Backend.VURL.Utilities (generateEquivilantKey)
+import Backend.VURL.Utilities (recordVurlKey)
 
 import qualified Data.Map as M
 
@@ -169,18 +169,11 @@ downloadKey urlincludeexclude key _af dest p vc =
 		| otherwise = return (Just v)
 	
 	recordvurlkey eks = do
-		-- Make sure to pick a backend that is cryptographically
+		b <- hashBackend
-		-- secure.
+		ifM (recordVurlKey b dest key eks)
-		db <- defaultBackend
+			( return (Just Verified)
-		let b = if isCryptographicallySecure db
+			, return Nothing
-			then db
+			)
-			else defaultHashBackend
-		generateEquivilantKey b dest >>= \case
-			Nothing -> return Nothing
-			Just ek -> do
-				unless (ek `elem` eks) $
-					setEquivilantKey key ek
-				return (Just Verified)
 
 uploadKey :: Key -> AssociatedFile -> Maybe OsPath -> MeterUpdate -> Annex ()
 uploadKey _ _ _ _ = giveup "upload to web not supported"