File tree Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -113,21 +113,25 @@ commandRender =
113
113
114
114
commandQuery :: Parser (IO () )
115
115
commandQuery =
116
- subparser
116
+ hsubparser
117
117
( command " is-affected" (info isAffected (progDesc " Check if a package/version range is marked vulnerable" ))
118
118
)
119
119
where
120
120
isAffected :: Parser (IO () )
121
121
isAffected =
122
122
go
123
- <$> argument str (metavar " PACKAGE" )
123
+ <$> argument (parseComponent <$> str) (metavar " PACKAGE|GHC:COMPONENT " )
124
124
<*> optional (option versionRangeReader (metavar " VERSION-RANGE" <> short ' v' <> long " version-range" ))
125
125
<*> optional (option str (metavar " ADVISORIES-PATH" <> short ' p' <> long " advisories-path" ))
126
126
where
127
- go :: T. Text -> Maybe VersionRange -> Maybe FilePath -> IO ()
128
- go packageName versionRange advisoriesPath = do
127
+ parseComponent raw =
128
+ fromMaybe (Hackage raw) $ do
129
+ ghcComponentRaw <- T. stripPrefix " ghc:" $ T. toLower raw
130
+ GHC <$> ghcComponentFromText ghcComponentRaw
131
+ go :: ComponentIdentifier -> Maybe VersionRange -> Maybe FilePath -> IO ()
132
+ go component versionRange advisoriesPath = do
129
133
let versionRange' = fromMaybe anyVersion versionRange
130
- maybeAffectedAdvisories <- listVersionRangeAffectedBy (fromMaybe " ." advisoriesPath) packageName versionRange'
134
+ maybeAffectedAdvisories <- listVersionRangeAffectedBy (fromMaybe " ." advisoriesPath) component versionRange'
131
135
case maybeAffectedAdvisories of
132
136
Validation. Failure errors -> do
133
137
T. hPutStrLn stderr " Cannot parse some advisories"
You can’t perform that action at this time.
0 commit comments