mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

only proxy to a remote when remote.name.annex-proxy is set

Browse source 
Avoids someone writing to proxy.log and gaining access to remotes
of someone else's repository that they were not intended to be able
to proxy to.
This commit is contained in:
Joey Hess 2024-06-18 11:43:10 -04:00
parent fb0fd78485
commit ca08f3fcc2
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CmdLine/GitAnnexShell.hs
View file

@ -20,6 +20,7 @@ import CmdLine.GitAnnexShell.Fields
import Remote.GCrypt (getGCryptUUID) import Remote.GCrypt (getGCryptUUID)
import P2P.Protocol (ServerMode(..)) import P2P.Protocol (ServerMode(..))
import Git.Types import Git.Types
import qualified Types.Remote as R
import Logs.Proxy import Logs.Proxy
import Logs.Cluster import Logs.Cluster
import Logs.UUID import Logs.UUID
@ -204,8 +205,9 @@ checkProxy remoteuuid ouruuid = M.lookup ouruuid <$> getProxies >>= \case
proxyfor ps = do proxyfor ps = do
rs <- concat . byCost <$> remoteList rs <- concat . byCost <$> remoteList
let sameuuid r = uuid r == remoteuuid let sameuuid r = uuid r == remoteuuid
let proxyconfigured = remoteAnnexProxy . R.gitconfig
let samename r p = name r == proxyRemoteName p let samename r p = name r == proxyRemoteName p
case headMaybe (filter (\r -> sameuuid r && any (samename r) ps) rs) of case headMaybe (filter (\r -> sameuuid r && proxyconfigured r && any (samename r) ps) rs) of
Nothing -> notconfigured Nothing -> notconfigured
Just r -> do Just r -> do
Annex.changeState $ \st -> Annex.changeState $ \st ->