X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FAuthorization.hs;h=0f865c3dee08b7be0baf710c5a6216d23d41a879;hb=5b25efa958eac431edbcd97194ac51bb05a7c69b;hp=8f32ddfc613420e005e898e24ac08be920cbee0e;hpb=4e428cf86da68b72ef8fdff87990e7c953c8f12e;p=Rakka.git

diff --git a/Rakka/Authorization.hs b/Rakka/Authorization.hs
index 8f32ddf..0f865c3 100644
--- a/Rakka/Authorization.hs
+++ b/Rakka/Authorization.hs
@@ -5,15 +5,15 @@ module Rakka.Authorization
     )
     where
 
-import qualified Codec.Binary.Base64 as B64
 import qualified Codec.Binary.UTF8.String as UTF8
 import           Control.Concurrent.STM
 import           Control.Monad.Trans
-import qualified Data.Digest.SHA1 as SHA1
+import qualified Data.ByteString as B
 import           Data.Map (Map)
 import qualified Data.Map as M hiding (Map)
 import           Data.Maybe
-import           Data.Word
+import           OpenSSL.EVP.Base64
+import           OpenSSL.EVP.Digest
 import           Rakka.SystemConfig
 import           System.Directory
 import           System.FilePath
@@ -28,7 +28,7 @@ data AuthDB
       }
 
 
-type UserMap = Map String [Word8]
+type UserMap = Map String String
 
 
 mkAuthDB :: FilePath -> IO AuthDB
@@ -45,10 +45,10 @@ mkAuthDB lsdir
 
 isValidPair :: MonadIO m => AuthDB -> String -> String -> m Bool
 isValidPair adb name pass
-    = let hash = SHA1.hash (UTF8.encode pass)
-      in
-        liftIO $ atomically $ do m <- readTVar (adbUserMap adb)
-                                 return (M.lookup name m == Just hash)
+    = liftIO $ do sha1 <- return . fromJust =<< getDigestByName "SHA1"
+                  let hash = digestBS sha1 $ B.pack $ UTF8.encode pass
+                  atomically $ do m <- readTVar (adbUserMap adb)
+                                  return (M.lookup name m == Just hash)
 
 
 loadUserMap :: FilePath -> IO UserMap
@@ -60,16 +60,17 @@ loadUserMap path
                       return . M.fromList . map decodePair . fromJust . deserializeStringPairs
                   else
                       return M.empty
-         return (initMap m)
+         sha1  <- return . fromJust =<< getDigestByName "SHA1"
+         return (initMap sha1 m)
     where
-      decodePair :: (String, String) -> (String, [Word8])
+      decodePair :: (String, String) -> (String, String)
       decodePair (name, b64Hash)
-          = (UTF8.decodeString name, B64.decode b64Hash)
+          = (UTF8.decodeString name, decodeBase64 b64Hash)
 
-      initMap :: UserMap -> UserMap
-      initMap m
+      initMap :: Digest -> UserMap -> UserMap
+      initMap sha1 m
           | M.null m  = let name = "root"
-                            hash = SHA1.hash []
+                            hash = digest sha1 ""
                         in
                           M.singleton name hash
           | otherwise = m