Skip to content
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

Add repo_verify_origin config option #51

Merged
merged 1 commit into from
Dec 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/hex_core.erl
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ J1i2xWFndWa6nfFnRxZmCStCOZWYYPlaxr+FZceFbpMwzTNs4g3d4tLNUcbKAIH4
repo_url => binary(),
repo_public_key => binary(),
repo_verify => boolean(),
repo_verify_origin => boolean(),
organization => binary()
}.

Expand All @@ -39,5 +40,6 @@ default_config() ->
repo_name => <<"hexpm">>,
repo_url => <<"https://repo.hex.pm">>,
repo_public_key => ?HEXPM_PUBLIC_KEY,
repo_verify => true
repo_verify => true,
repo_verify_origin => true
}.
12 changes: 12 additions & 0 deletions src/hex_registry.erl
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ encode_names(Names) ->

%% @doc
%% Decode message created with encode_names/1.
decode_names(Payload, no_verify) ->
#{packages := Packages} = hex_pb_names:decode_msg(Payload, 'Names'),
{ok, Packages};

decode_names(Payload, Repository) ->
case hex_pb_names:decode_msg(Payload, 'Names') of
#{repository := Repository, packages := Packages} ->
Expand All @@ -43,6 +47,10 @@ encode_versions(Versions) ->

%% @doc
%% Decode message created with encode_versions/1.
decode_versions(Payload, no_verify) ->
#{packages := Packages} = hex_pb_versions:decode_msg(Payload, 'Versions'),
{ok, Packages};

decode_versions(Payload, Repository) ->
case hex_pb_versions:decode_msg(Payload, 'Versions') of
#{repository := Repository, packages := Packages} ->
Expand All @@ -58,6 +66,10 @@ encode_package(Package) ->

%% @doc
%% Decode message created with encode_package/1.
decode_package(Payload, no_verify, no_verify) ->
#{releases := Releases} = hex_pb_package:decode_msg(Payload, 'Package'),
{ok, Releases};

decode_package(Payload, Repository, Package) ->
case hex_pb_package:decode_msg(Payload, 'Package') of
#{repository := Repository, name := Package, releases := Releases} ->
Expand Down
8 changes: 7 additions & 1 deletion src/hex_repo.erl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,13 @@ get_versions(#{repo_name := Repository} = Config) when is_map(Config) ->
%% '''
%% @end
get_package(#{repo_name := Repository} = Config, Name) when is_binary(Name) and is_map(Config) ->
Decoder = fun(Data) -> hex_registry:decode_package(Data, Repository, Name) end,
Verify = maps:get(repo_verify_origin, Config, true),
Decoder = fun(Data) ->
case Verify of
true -> hex_registry:decode_package(Data, Repository, Name);
false -> hex_registry:decode_package(Data, no_verify, no_verify)
end
end,
get_protobuf(Config, <<"/packages/", Name/binary>>, Decoder).

%% @doc
Expand Down
3 changes: 3 additions & 0 deletions test/hex_registry_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ names_test(_Config) ->
},
Payload = hex_registry:encode_names(Names),
?assertMatch({ok, Packages}, hex_registry:decode_names(Payload, <<"hexpm">>)),
?assertMatch({ok, Packages}, hex_registry:decode_names(Payload, no_verify)),
?assertMatch({error, unverified}, hex_registry:decode_names(Payload, <<"other_repo">>)),
ok.

Expand All @@ -45,6 +46,7 @@ versions_test(_Config) ->
},
Payload = hex_registry:encode_versions(Versions),
?assertMatch({ok, Packages}, hex_registry:decode_versions(Payload, <<"hexpm">>)),
?assertMatch({ok, Packages}, hex_registry:decode_versions(Payload, no_verify)),
?assertMatch({error, unverified}, hex_registry:decode_versions(Payload, <<"other_repo">>)),
ok.

Expand Down Expand Up @@ -82,6 +84,7 @@ package_test(_Config) ->
},
Payload = hex_registry:encode_package(Package),
?assertMatch({ok, Releases}, hex_registry:decode_package(Payload, <<"hexpm">>, <<"foobar">>)),
?assertMatch({ok, Releases}, hex_registry:decode_package(Payload, no_verify, no_verify)),
?assertMatch({error, unverified}, hex_registry:decode_package(Payload, <<"other_repo">>, <<"foobar">>)),
?assertMatch({error, unverified}, hex_registry:decode_package(Payload, <<"hexpm">>, <<"other_package">>)),
ok.
Expand Down