Better sanitization of problem characters when generating URL and WORM keys.
FAT has a lot of characters it does not allow in filenames, like ? and * It's probably the worst offender, but other filesystems also have limitiations. In 2011, I made keyFile escape : to handle FAT, but missed the other characters. It also turns out that when I did that, I was also living dangerously; any existing keys that contained a : had their object location change. Oops. So, adding new characters to escape to keyFile is out. Well, it would be possible to make keyFile behave differently on a per-filesystem basis, but this would be a real nightmare to get right. Consider that a rsync special remote uses keyFile to determine the filenames to use, and we don't know the underlying filesystem on the rsync server.. Instead, I have gone for a solution that is backwards compatable and simple. Its only downside is that already generated URL and WORM keys might not be able to be stored on FAT or some other filesystem that dislikes a character used in the key. (In this case, the user can just migrate the problem keys to a checksumming backend. If this became a big problem, fsck could be made to detect these and suggest a migration.) Going forward, new keys that are created will escape all characters that are likely to cause problems. And if some filesystem comes along that's even worse than FAT (seems unlikely, but here it is 2013, and people are still using FAT!), additional characters can be added to the set that are escaped without difficulty. (Also, made WORM limit the part of the filename that is embedded in the key, to deal with filesystem filename length limits. This could have already been a problem, but is more likely now, since the escaping of the filename can make it longer.) This commit was sponsored by Ian Downes
This commit is contained in:
parent
3dac026598
commit
1be4d281d6
6 changed files with 74 additions and 20 deletions
|
@ -10,11 +10,10 @@ module Backend.URL (
|
|||
fromUrl
|
||||
) where
|
||||
|
||||
import Data.Hash.MD5
|
||||
|
||||
import Common.Annex
|
||||
import Types.Backend
|
||||
import Types.Key
|
||||
import Backend.Utilities
|
||||
|
||||
backends :: [Backend]
|
||||
backends = [backend]
|
||||
|
@ -27,18 +26,12 @@ backend = Backend
|
|||
, canUpgradeKey = Nothing
|
||||
}
|
||||
|
||||
{- When it's not too long, use the full url as the key name.
|
||||
- If the url is too long, it's truncated at half the filename length
|
||||
- limit, and the md5 of the url is prepended to ensure a unique key. -}
|
||||
{- Every unique url has a corresponding key. -}
|
||||
fromUrl :: String -> Maybe Integer -> Annex Key
|
||||
fromUrl url size = do
|
||||
limit <- liftIO . fileNameLengthLimit =<< fromRepo gitAnnexDir
|
||||
let truncurl = truncateFilePath (limit `div` 2) url
|
||||
let key = if url == truncurl
|
||||
then url
|
||||
else truncurl ++ "-" ++ md5s (Str url)
|
||||
n <- genKeyName url
|
||||
return $ stubKey
|
||||
{ keyName = key
|
||||
{ keyName = n
|
||||
, keyBackendName = "URL"
|
||||
, keySize = size
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue