fix: /nar: handle nar-serve URLs #293
Merged
Conversation
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
Old requests from nar-serve were never routed to the handler, as harmonia complained about being unable to serialize `hash`, as it failed to populate the NarRequest struct. This means, the `get` function was never executed for the "/nar/outhash-narhash.nar" case. Additionally, the logic was a bit hard to debug, as multiple "hash" variables meaning different things were present. I refactored the URL handler to have two URL handlers, populating a new `PathParams` struct with `narhash` and `outhash` fields. I also pushed length validations into the regex that's now used in the URL handler directly (and introduced validation for the strings to be nixbase32) This simplifies the logic in the URL handler a bit, and most importantly, fixes support for URLs generated by nar-serve. Both URLs were manually verified to now serve a NAR.
13 tasks
13 tasks
Mic92
pushed a commit
to NixOS/nixpkgs
that referenced
this pull request
Mar 22, 2024
This cherry-picks nix-community/harmonia#293 into 0.7.3. We can't bump to Harmonia 0.7.5 in release-23.11 as it brings a libnixstore bump with backwards-incompatible changes (for a new Nix version that's not available in 23.11).
Mic92
added a commit
to NixOS/nixpkgs
that referenced
this pull request
Mar 22, 2024
harmonia: cherry-pick nix-community/harmonia#293
zeme-wana
pushed a commit
to input-output-hk/nixpkgs
that referenced
this pull request
May 8, 2024
This cherry-picks nix-community/harmonia#293 into 0.7.3. We can't bump to Harmonia 0.7.5 in release-23.11 as it brings a libnixstore bump with backwards-incompatible changes (for a new Nix version that's not available in 23.11).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Old requests from nar-serve were never routed to the handler, as harmonia complained about being unable to serialize
hash, as it failed to populate the NarRequest struct.This means, the
getfunction was never executed for the "/nar/outhash-narhash.nar" case.Additionally, the logic was a bit hard to debug, as multiple "hash" variables meaning different things were present.
I refactored the URL handler to have two URL handlers, populating a new
PathParamsstruct withnarhashandouthashfields.I also pushed length validations into the regex that's now used in the URL handler directly (and introduced validation for the strings to be nixbase32)
This simplifies the logic in the URL handler a bit, and most importantly, fixes support for URLs generated by nar-serve.
Both URLs were manually verified to now serve a NAR.