summaryrefslogtreecommitdiff
path: root/Types
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2018-06-18 15:36:12 -0400
committerJoey Hess <joeyh@joeyh.name>2018-06-18 15:37:17 -0400
commit3c0a538335a71a2ecfa7d76f0a87da9e24b6804c (patch)
tree1923a9ea838f40f5714a9900026c2b3046543272 /Types
parentc93b6c1e08e7733a0efae112f18bcad977fe1236 (diff)
allow ftp urls by default
They're no worse than http certianly. And, the backport of these security fixes has to deal with wget, which supports http https and ftp and has no way to turn off individual schemes, so this will make that easier.
Diffstat (limited to 'Types')
-rw-r--r--Types/GitConfig.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs
index 98c8c6e83c..7d9ccbff1f 100644
--- a/Types/GitConfig.hs
+++ b/Types/GitConfig.hs
@@ -162,7 +162,7 @@ extractGitConfig r = GitConfig
, annexRetryDelay = Seconds
<$> getmayberead (annex "retrydelay")
, annexAllowedUrlSchemes = S.fromList $ map mkScheme $
- maybe ["http", "https"] words $
+ maybe ["http", "https", "ftp"] words $
getmaybe (annex "security.allowed-url-schemes")
, annexAllowedHttpAddresses = fromMaybe "" $
getmaybe (annex "security.allowed-http-addresses")