-
Notifications
You must be signed in to change notification settings - Fork 94
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Warns users about non-ghcup channels #1230
Open
qxrein
wants to merge
1
commit into
haskell:master
Choose a base branch
from
qxrein:patch-1
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+45
−3
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -89,6 +89,8 @@ import qualified Data.Text as T | |
import qualified Data.Text.IO as T | ||
import qualified Data.Text.Encoding as E | ||
import qualified Data.Yaml.Aeson as Y | ||
import Data.List (isPrefixOf) | ||
import Control.Monad.IO.Class (liftIO) | ||
|
||
|
||
|
||
|
@@ -102,6 +104,33 @@ import qualified Data.Yaml.Aeson as Y | |
------------------ | ||
|
||
|
||
formatURI :: URI -> T.Text | ||
formatURI uri = | ||
let scheme = E.decodeUtf8 $ schemeBS $ uriScheme uri | ||
auth = case uriAuthority uri of | ||
Just a -> "//" <> E.decodeUtf8 (hostBS $ authorityHost a) | ||
Nothing -> "" | ||
path = E.decodeUtf8 $ uriPath uri | ||
in scheme <> ":" <> auth <> path | ||
|
||
-- | Logic to check if it is an Official Channel | ||
isOfficialURI :: URI -> Bool | ||
isOfficialURI uri = any (`isURIPrefix` uri) officialURIs | ||
where | ||
officialURIs = [isGitHubMetadata] | ||
isGitHubMetadata uri' = | ||
schemeBS (uriScheme uri') == "https" && | ||
maybe False (\a -> hostBS (authorityHost a) == "raw.githubusercontent.com") (uriAuthority uri') && | ||
pathStartsWith "/haskell/ghcup-metadata/" (uriPath uri') | ||
pathStartsWith prefix path = prefix `B.isPrefixOf` path | ||
isURIPrefix predicate uri' = predicate uri' | ||
|
||
-- | Special case to check for nightlies URL | ||
isNightliesURI :: URI -> Bool | ||
isNightliesURI uri = | ||
schemeBS (uriScheme uri) == "https" && | ||
maybe False (\a -> hostBS (authorityHost a) == "ghc.gitlab.haskell.org") (uriAuthority uri) && | ||
uriPath uri == "/ghcup-metadata/ghcup-nightlies-0.0.7.yaml" | ||
|
||
-- | Downloads the download information! But only if we need to ;P | ||
getDownloadsF :: ( FromJSONKey Tool | ||
|
@@ -124,6 +153,17 @@ getDownloadsF :: ( FromJSONKey Tool | |
GHCupInfo | ||
getDownloadsF pfreq@(PlatformRequest arch plat _) = do | ||
Settings { urlSource } <- lift getSettings | ||
forM_ urlSource $ \src -> | ||
case src of | ||
NewURI uri -> do | ||
when (not (isOfficialURI uri) || isNightliesURI uri) $ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
logWarn $ "Warning: Using non-official metadata source: " <> formatURI uri <> | ||
"\nThis source is not maintained or verified by the GHCup team." | ||
NewGHCupInfo _ -> | ||
logWarn "Warning: Using custom GHCupInfo data that is not from an official GHCup metadata source" | ||
NewSetupInfo _ -> | ||
logWarn "Warning: Using custom SetupInfo data that is not from an official GHCup metadata source" | ||
_ -> pure () | ||
infos <- liftE $ mapM dl' urlSource | ||
keys <- if any isRight infos | ||
then liftE . reThrowAll @_ @_ @'[StackPlatformDetectError] StackPlatformDetectError $ getStackPlatformKey pfreq | ||
|
@@ -133,7 +173,7 @@ getDownloadsF pfreq@(PlatformRequest arch plat _) = do | |
Right si -> pure $ fromStackSetupInfo si keys | ||
mergeGhcupInfo ghcupInfos | ||
where | ||
|
||
dl' :: ( FromJSONKey Tool | ||
, FromJSONKey Version | ||
, FromJSON VersionInfo | ||
|
@@ -162,7 +202,9 @@ getDownloadsF pfreq@(PlatformRequest arch plat _) = do | |
catchE @JSONError (\(JSONDecodeError s) -> do | ||
logDebug $ "Couldn't decode " <> T.pack base <> " as GHCupInfo, trying as SetupInfo: " <> T.pack s | ||
Right <$> decodeMetadata @Stack.SetupInfo base) | ||
$ fmap Left (decodeMetadata @GHCupInfo base >>= \gI -> warnOnMetadataUpdate uri gI >> pure gI) | ||
$ fmap Left (decodeMetadata @GHCupInfo base >>= \gI -> | ||
warnOnMetadataUpdate uri gI >> pure gI) | ||
|
||
|
||
fromStackSetupInfo :: MonadThrow m | ||
=> Stack.SetupInfo | ||
|
@@ -890,4 +932,4 @@ applyMirrors (DM ms) uri@(URI { uriAuthority = Just (Authority { authorityHost = | |
} | ||
Just (DownloadMirror auth Nothing) -> | ||
uri { uriAuthority = Just auth } | ||
applyMirrors _ uri = uri | ||
applyMirrors _ uri = uri |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will trigger on
file://
URLs... which we don't want.