-
Notifications
You must be signed in to change notification settings - Fork 202
Add client identifier header to HTTP requests #1075
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
95452f7
Add client identifier header to HTTP requests
sorentwo 6515b14
Rename identifier header to x-hex-repo-id
sorentwo 9de9bfe
Respect HEX_REPO_IDENTIFIER environment variable
sorentwo ffb5c02
Add local caching to repo identifier lookup
sorentwo 100e500
Use Hex.State agent for identifier config
sorentwo 34d84bc
Use Hex.State to store cached repo identifier
sorentwo 7d14507
Print error message on non-zero identifier message
sorentwo 37fee2d
Synchronize cached repo identifier access
sorentwo 5e32978
Merge remote-tracking branch 'origin' into client-identifier
ericmj 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 hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| defmodule Hex.RepoIdentifier do | ||
| @moduledoc """ | ||
| Gets an anonymized identifier for the current git repository. | ||
|
|
||
| This module caches the SHA of the first commit in the repository and hashes it once more for | ||
| anonymization. | ||
|
|
||
| Returns `nil` when: | ||
|
|
||
| - The `HEX_REPO_IDENTIFIER` environment variable is set to anything other `1` or `true` | ||
| - The `git` executable isn't available | ||
| - The current directory isn't within a git repository | ||
| """ | ||
|
|
||
| use Agent | ||
|
|
||
| def start_link(_args) do | ||
| Agent.start_link(fn -> nil end, name: __MODULE__) | ||
| end | ||
|
|
||
| def fetch do | ||
| Agent.get_and_update(__MODULE__, fn | ||
| nil -> | ||
| value = get() | ||
|
|
||
| {value, value} | ||
|
|
||
| cached -> | ||
| {cached, cached} | ||
| end) | ||
| end | ||
|
|
||
| def put(value) do | ||
| Agent.update(__MODULE__, fn _value -> value end) | ||
| end | ||
|
|
||
| def get do | ||
| cond do | ||
| Hex.State.get(:no_repo_identifier) -> | ||
| nil | ||
|
|
||
| output = initial_commit_sha() -> | ||
| output | ||
| |> String.trim() | ||
| |> then(&:crypto.hash(:sha256, &1)) | ||
| |> Base.encode16(case: :lower) | ||
|
|
||
| true -> | ||
| nil | ||
| end | ||
| end | ||
|
|
||
| def clear do | ||
| Agent.update(__MODULE__, fn _value -> nil end) | ||
| end | ||
|
|
||
| defp initial_commit_sha do | ||
| cmd_args = ~w(rev-list --max-parents=0 HEAD) | ||
|
|
||
| with path when is_binary(path) <- System.find_executable("git") do | ||
| case System.cmd("git", cmd_args, stderr_to_stdout: true) do | ||
| {output, 0} -> | ||
| output | ||
|
|
||
| {output, exit_status} -> | ||
| Hex.Shell.debug( | ||
| " Unable to extract git identifier: (Exit #{exit_status}) \n\n" <> output | ||
| ) | ||
| end | ||
| end | ||
| end | ||
| end | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| defmodule Hex.RepoIdentifierTest do | ||
| use ExUnit.Case | ||
|
|
||
| alias Hex.RepoIdentifier | ||
|
|
||
| setup do | ||
| RepoIdentifier.clear() | ||
|
|
||
| :ok | ||
| end | ||
|
|
||
| describe "get/0" do | ||
| test "an identifier is included within a repository" do | ||
| assert RepoIdentifier.get() =~ ~r/^[a-f0-9]{64}$/ | ||
| end | ||
|
|
||
| test "identifier is nil outside of a repository" do | ||
| # The tmp_dir resolves at hex/test/tmp, which allows git to traverse up to the repository | ||
| # root and find a commit. We're creating a temporary directory to simulate being outside of | ||
| # a repository instead. | ||
| dir = | ||
| "../../.." | ||
| |> Path.expand(__DIR__) | ||
| |> Path.join("empty-directory") | ||
|
|
||
| try do | ||
| File.mkdir!(dir) | ||
|
|
||
| File.cd!(dir, fn -> refute RepoIdentifier.get() end) | ||
| after | ||
| File.rmdir(dir) | ||
| end | ||
| end | ||
|
|
||
| test "identifier is nil when disabled by an environment variable" do | ||
| System.put_env("HEX_NO_REPO_IDENTIFIER", "1") | ||
| Hex.State.refresh() | ||
|
|
||
| refute RepoIdentifier.get() | ||
| after | ||
| System.delete_env("HEX_NO_REPO_IDENTIFIER") | ||
| Hex.State.refresh() | ||
| end | ||
| end | ||
|
|
||
| describe "fetch/0" do | ||
| test "the identifier is cached accross calls" do | ||
| value = "cached-identifier" | ||
|
|
||
| RepoIdentifier.put(value) | ||
|
|
||
| assert value == RepoIdentifier.fetch() | ||
| end | ||
| end | ||
| end |
Oops, something went wrong.
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.
Maybe it should be “ HEX_NO_REPO_IDENTIFIER”
?
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.
Either version is fine by me (
HEX_REPO_IDENTIFIER=falseorHEX_NO_REPO_IDENTIFIER=true)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.
I mean, the doc here says:
HEX_REPO_IDENTIFIERBut the code is actually using
NO_HEX_REPO_IDENTIFIER:https://github.com/sorentwo/hex/blob/5e329783583aa4d5929953ce95a73d68590406d2/lib/hex/state.ex#L115-L116
So maybe the docs should be changed to
NO_HEX_REPO_IDENTIFIER.Or, I'm missing something. 😅
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.
Oh, it's already fixed: https://github.com/hexpm/hex/blob/68758fbffda1069fda61fa503b83844b39513fbe/lib/hex/repo_identifier.ex#L10C10-L10C32
I'm sorry. 😅
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.
My mistake! This PR drifted a while and I completely forgot about the name change. Glad @ericmj took care of it =)