2011-07-06 00:16:57 +00:00
|
|
|
{- git-annex remote log
|
|
|
|
-
|
2015-01-21 16:50:09 +00:00
|
|
|
- Copyright 2011 Joey Hess <id@joeyh.name>
|
2011-07-06 00:16:57 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2011-07-06 00:16:57 +00:00
|
|
|
-}
|
|
|
|
|
2011-10-15 20:21:08 +00:00
|
|
|
module Logs.Remote (
|
add ConfigMonitor thread
Monitors git-annex branch for changes, which are noticed by the Merger
thread whenever the branch ref is changed (either due to an incoming push,
or a local change), and refreshes cached config values for modified config
files.
Rate limited to run no more often than once per minute. This is important
because frequent git-annex branch changes happen when files are being
added, or transferred, etc.
A primary use case is that, when preferred content changes are made,
and get pushed to remotes, the remotes start honoring those settings.
Other use cases include propigating repository description and trust
changes to remotes, and learning when a remote has added a new special
remote, so the webapp can present the GUI to enable that special remote
locally.
Also added a uuid.log cache. All other config files already had caches.
2012-10-20 20:37:06 +00:00
|
|
|
remoteLog,
|
2011-07-06 00:16:57 +00:00
|
|
|
readRemoteLog,
|
|
|
|
configSet,
|
|
|
|
keyValToConfig,
|
|
|
|
configToKeyVal,
|
2012-12-20 04:02:33 +00:00
|
|
|
showConfig,
|
2011-07-06 00:16:57 +00:00
|
|
|
|
2015-11-16 18:37:31 +00:00
|
|
|
prop_isomorphic_configEscape,
|
2012-12-20 04:02:33 +00:00
|
|
|
prop_parse_show_Config,
|
2011-07-06 00:16:57 +00:00
|
|
|
) where
|
|
|
|
|
2016-01-20 20:36:33 +00:00
|
|
|
import Annex.Common
|
2011-10-04 04:40:47 +00:00
|
|
|
import qualified Annex.Branch
|
2011-07-06 00:16:57 +00:00
|
|
|
import Types.Remote
|
2013-08-29 22:51:22 +00:00
|
|
|
import Logs
|
2011-10-15 20:21:08 +00:00
|
|
|
import Logs.UUIDBased
|
2011-07-06 00:16:57 +00:00
|
|
|
|
2017-08-14 17:55:38 +00:00
|
|
|
import qualified Data.Map as M
|
|
|
|
import Data.Char
|
convert old uuid-based log parsers to attoparsec
This preserves the workaround for the old bug that caused NoUUID items
to be stored in the log, prefixing log lines with " ". It's now handled
implicitly, by using takeWhile1 (/= ' ') to get the uuid.
There is a behavior change from the old parser, which split the value
into words and then recombined it. That meant that "foo bar" and "foo\tbar"
came out as "foo bar". That behavior was not documented, and seems
surprising; it meant that after a git-annex describe here "foo bar",
you wouldn't get that same string back out when git-annex displayed repo
descriptions.
Otoh, some other parsers relied on the old behavior, and the attoparsec
rewrites had to deal with the issue themselves...
For group.log, there are some edge cases around the user providing a
group name with a leading or trailing space. The old parser would ignore
such excess whitespace. The new parser does too, because the alternative
is to refuse to parse something like " group1 group2 " due to excess
whitespace, which would be even more confusing behavior.
The only git-annex branch log file that is not converted to attoparsec
and bytestring-builder now is transitions.log.
2019-01-10 18:39:36 +00:00
|
|
|
import qualified Data.Attoparsec.ByteString.Lazy as A
|
2019-01-09 18:00:35 +00:00
|
|
|
import Data.ByteString.Builder
|
2017-08-14 17:55:38 +00:00
|
|
|
|
2011-07-06 00:16:57 +00:00
|
|
|
{- Adds or updates a remote's config in the log. -}
|
|
|
|
configSet :: UUID -> RemoteConfig -> Annex ()
|
2017-08-14 17:55:38 +00:00
|
|
|
configSet u cfg = do
|
|
|
|
c <- liftIO currentVectorClock
|
2011-10-06 20:07:51 +00:00
|
|
|
Annex.Branch.change remoteLog $
|
2019-02-21 17:43:21 +00:00
|
|
|
buildLogOld (byteString . encodeBS . showConfig)
|
2019-01-09 18:00:35 +00:00
|
|
|
. changeLog c u cfg
|
2019-02-21 17:43:21 +00:00
|
|
|
. parseLogOld remoteConfigParser
|
2011-07-06 00:16:57 +00:00
|
|
|
|
|
|
|
{- Map of remotes by uuid containing key/value config maps. -}
|
|
|
|
readRemoteLog :: Annex (M.Map UUID RemoteConfig)
|
2019-02-21 17:43:21 +00:00
|
|
|
readRemoteLog = simpleMap . parseLogOld remoteConfigParser
|
convert old uuid-based log parsers to attoparsec
This preserves the workaround for the old bug that caused NoUUID items
to be stored in the log, prefixing log lines with " ". It's now handled
implicitly, by using takeWhile1 (/= ' ') to get the uuid.
There is a behavior change from the old parser, which split the value
into words and then recombined it. That meant that "foo bar" and "foo\tbar"
came out as "foo bar". That behavior was not documented, and seems
surprising; it meant that after a git-annex describe here "foo bar",
you wouldn't get that same string back out when git-annex displayed repo
descriptions.
Otoh, some other parsers relied on the old behavior, and the attoparsec
rewrites had to deal with the issue themselves...
For group.log, there are some edge cases around the user providing a
group name with a leading or trailing space. The old parser would ignore
such excess whitespace. The new parser does too, because the alternative
is to refuse to parse something like " group1 group2 " due to excess
whitespace, which would be even more confusing behavior.
The only git-annex branch log file that is not converted to attoparsec
and bytestring-builder now is transitions.log.
2019-01-10 18:39:36 +00:00
|
|
|
<$> Annex.Branch.get remoteLog
|
2011-10-06 20:07:51 +00:00
|
|
|
|
convert old uuid-based log parsers to attoparsec
This preserves the workaround for the old bug that caused NoUUID items
to be stored in the log, prefixing log lines with " ". It's now handled
implicitly, by using takeWhile1 (/= ' ') to get the uuid.
There is a behavior change from the old parser, which split the value
into words and then recombined it. That meant that "foo bar" and "foo\tbar"
came out as "foo bar". That behavior was not documented, and seems
surprising; it meant that after a git-annex describe here "foo bar",
you wouldn't get that same string back out when git-annex displayed repo
descriptions.
Otoh, some other parsers relied on the old behavior, and the attoparsec
rewrites had to deal with the issue themselves...
For group.log, there are some edge cases around the user providing a
group name with a leading or trailing space. The old parser would ignore
such excess whitespace. The new parser does too, because the alternative
is to refuse to parse something like " group1 group2 " due to excess
whitespace, which would be even more confusing behavior.
The only git-annex branch log file that is not converted to attoparsec
and bytestring-builder now is transitions.log.
2019-01-10 18:39:36 +00:00
|
|
|
remoteConfigParser :: A.Parser RemoteConfig
|
|
|
|
remoteConfigParser = keyValToConfig . words . decodeBS <$> A.takeByteString
|
2011-10-06 20:07:51 +00:00
|
|
|
|
|
|
|
showConfig :: RemoteConfig -> String
|
|
|
|
showConfig = unwords . configToKeyVal
|
2011-07-06 00:16:57 +00:00
|
|
|
|
|
|
|
{- Given Strings like "key=value", generates a RemoteConfig. -}
|
|
|
|
keyValToConfig :: [String] -> RemoteConfig
|
|
|
|
keyValToConfig ws = M.fromList $ map (/=/) ws
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
(/=/) s = (k, v)
|
|
|
|
where
|
|
|
|
k = takeWhile (/= '=') s
|
|
|
|
v = configUnEscape $ drop (1 + length k) s
|
2011-07-06 00:16:57 +00:00
|
|
|
|
|
|
|
configToKeyVal :: M.Map String String -> [String]
|
|
|
|
configToKeyVal m = map toword $ sort $ M.toList m
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
toword (k, v) = k ++ "=" ++ configEscape v
|
2011-07-06 00:16:57 +00:00
|
|
|
|
|
|
|
configEscape :: String -> String
|
2012-05-02 23:51:41 +00:00
|
|
|
configEscape = concatMap escape
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
escape c
|
|
|
|
| isSpace c || c `elem` "&" = "&" ++ show (ord c) ++ ";"
|
|
|
|
| otherwise = [c]
|
2011-07-06 00:16:57 +00:00
|
|
|
|
|
|
|
configUnEscape :: String -> String
|
|
|
|
configUnEscape = unescape
|
2012-11-11 04:51:07 +00:00
|
|
|
where
|
|
|
|
unescape [] = []
|
|
|
|
unescape (c:rest)
|
|
|
|
| c == '&' = entity rest
|
|
|
|
| otherwise = c : unescape rest
|
|
|
|
entity s
|
|
|
|
| not (null num) && ";" `isPrefixOf` r =
|
|
|
|
chr (Prelude.read num) : unescape rest
|
|
|
|
| otherwise =
|
|
|
|
'&' : unescape s
|
|
|
|
where
|
|
|
|
num = takeWhile isNumber s
|
|
|
|
r = drop (length num) s
|
|
|
|
rest = drop 1 r
|
2011-07-06 00:16:57 +00:00
|
|
|
|
|
|
|
{- for quickcheck -}
|
2015-11-16 18:37:31 +00:00
|
|
|
prop_isomorphic_configEscape :: String -> Bool
|
|
|
|
prop_isomorphic_configEscape s = s == (configUnEscape . configEscape) s
|
2012-12-20 04:02:33 +00:00
|
|
|
|
|
|
|
prop_parse_show_Config :: RemoteConfig -> Bool
|
|
|
|
prop_parse_show_Config c
|
2019-01-21 16:38:00 +00:00
|
|
|
-- whitespace and '=' are not supported in config keys
|
|
|
|
| any (\k -> any isSpace k || elem '=' k) (M.keys c) = True
|
2019-01-21 22:39:25 +00:00
|
|
|
| any (any excluded) (M.keys c) = True
|
|
|
|
| any (any excluded) (M.elems c) = True
|
convert old uuid-based log parsers to attoparsec
This preserves the workaround for the old bug that caused NoUUID items
to be stored in the log, prefixing log lines with " ". It's now handled
implicitly, by using takeWhile1 (/= ' ') to get the uuid.
There is a behavior change from the old parser, which split the value
into words and then recombined it. That meant that "foo bar" and "foo\tbar"
came out as "foo bar". That behavior was not documented, and seems
surprising; it meant that after a git-annex describe here "foo bar",
you wouldn't get that same string back out when git-annex displayed repo
descriptions.
Otoh, some other parsers relied on the old behavior, and the attoparsec
rewrites had to deal with the issue themselves...
For group.log, there are some edge cases around the user providing a
group name with a leading or trailing space. The old parser would ignore
such excess whitespace. The new parser does too, because the alternative
is to refuse to parse something like " group1 group2 " due to excess
whitespace, which would be even more confusing behavior.
The only git-annex branch log file that is not converted to attoparsec
and bytestring-builder now is transitions.log.
2019-01-10 18:39:36 +00:00
|
|
|
| otherwise = A.parseOnly remoteConfigParser (encodeBS $ showConfig c) ~~ Right c
|
2012-12-20 04:02:33 +00:00
|
|
|
where
|
|
|
|
normalize v = sort . M.toList <$> v
|
|
|
|
a ~~ b = normalize a == normalize b
|
2019-01-21 22:39:25 +00:00
|
|
|
-- limit to ascii alphanumerics for simplicity; characters not
|
|
|
|
-- allowed by the current character set in the config may not
|
|
|
|
-- round-trip in an identical representation due to the use of the
|
|
|
|
-- filesystem encoding.
|
2019-01-22 00:40:30 +00:00
|
|
|
excluded ch = not (isAlphaNum ch) || not (isAscii ch)
|