Skip to content

Require user content domain for Package Candidates and Package Contents #1400

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.

Sign up for GitHub

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

Closed
ysangkok wants to merge 1 commit into from
Closed

Require user content domain for Package Candidates and Package Contents #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Distribution/Server/Features/PackageCandidates.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,10 +608,12 @@ candidatesFeature ServerEnv{serverBlobStore = store}
case mTarball of
Left err ->
errNotFound "Could not serve package contents" [MText err]
Right (fp, etag, index) ->
tarServeResponse <$> serveTarball (display (packageId pkg) ++ " candidate source tarball")
["index.html"] (display (packageId pkg)) fp index
[Public, maxAgeMinutes 5] etag Nothing
Right (fp, etag, index) -> do
tarServe <-
serveTarball (display (packageId pkg) ++ " candidate source tarball")
["index.html"] (display (packageId pkg)) fp index
[Public, maxAgeMinutes 5] etag Nothing
requireUserContent userFeatureServerEnv (tarServeResponse tarServe)

unpackUtf8 :: BS.ByteString -> String
unpackUtf8 = T.unpack
Expand Down
12 changes: 7 additions & 5 deletions src/Distribution/Server/Features/PackageContents.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ packageContentsFeature CoreFeature{ coreResource = CoreResource{
}
}
TarIndexCacheFeature{packageTarball, findToplevelFile}
UserFeature{queryGetUserDb}
UserFeature{queryGetUserDb, userFeatureServerEnv}
= PackageContentsFeature{..}
where
packageFeatureInterface = (emptyHackageFeature "package-contents") {
Expand Down Expand Up @@ -205,10 +205,12 @@ packageContentsFeature CoreFeature{ coreResource = CoreResource{
case mTarball of
Left err ->
errNotFound "Could not serve package contents" [MText err]
Right (fp, etag, index) ->
tarServeResponse <$> serveTarball (display (packageId pkg) ++ " source tarball")
[] (display (packageId pkg)) fp index
[Public, maxAgeDays 30] etag Nothing
Right (fp, etag, index) -> do
tarServe <-
serveTarball (display (packageId pkg) ++ " source tarball")
[] (display (packageId pkg)) fp index
[Public, maxAgeDays 30] etag Nothing
requireUserContent userFeatureServerEnv (tarServeResponse tarServe)

unpackUtf8 :: BS.ByteString -> String
unpackUtf8 = T.unpack
Expand Down
Loading