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

Support modules with encrypted debug info #1947

Closed
Closed
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
runs-on: ubuntu-20.04
env:
MIX_ENV: test
CI: true
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Improve warning when referencing type from a private module
* Rename "Search HexDocs package" modal to "Go to package docs". Support built-in Erlang/OTP
apps.
* Document how to use `.erlang.crypt` with ExDoc

* Bug fixes
* Switch anchor `title` to `aria-label`
Expand Down
36 changes: 36 additions & 0 deletions lib/ex_doc/config.ex
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ defmodule ExDoc.Config do
before_closing_head_tag: &__MODULE__.before_closing_head_tag/1,
canonical: nil,
cover: nil,
debug_info_fn: nil,
deps: [],
extra_section: nil,
extras: [],
Expand Down Expand Up @@ -50,6 +51,10 @@ defmodule ExDoc.Config do
title: nil,
version: nil

@typep debug_info_fn_arg :: :init | :clear | {:debug_info, atom(), module(), :file.filename()}
@typep debug_info_fn :: (debug_info_fn_arg ->
:ok | {:ok, (debug_info_fn_arg -> term())} | {:error, term()})

@type t :: %__MODULE__{
annotations_for_docs: (map() -> list()),
api_reference: boolean(),
Expand All @@ -61,6 +66,7 @@ defmodule ExDoc.Config do
before_closing_head_tag: (atom() -> String.t()) | mfa() | map(),
canonical: nil | String.t(),
cover: nil | Path.t(),
debug_info_fn: nil | debug_info_fn(),
deps: [{ebin_path :: String.t(), doc_url :: String.t()}],
extra_section: nil | String.t(),
extras: list(),
Expand Down Expand Up @@ -120,7 +126,23 @@ defmodule ExDoc.Config do
guess_url(options[:source_url], options[:source_ref] || @default_source_ref)
end)

{debug_info_key, options} = Keyword.pop(options, :debug_info_key)

{debug_info_fn, options} =
case Keyword.pop(options, :debug_info_fn) do
{nil, options} -> Keyword.pop(options, :debug_info_fun)
{debug_info_fn, options} -> {debug_info_fn, options}
end

debug_info_fn =
cond do
debug_info_fn != nil -> debug_info_fn
debug_info_key != nil -> default_debug_info_fn(debug_info_key)
true -> nil
end

preconfig = %__MODULE__{
debug_info_fn: debug_info_fn,
filter_modules: normalize_filter_modules(filter_modules),
groups_for_modules: normalize_groups_for_modules(groups_for_modules),
homepage_url: options[:homepage_url],
Expand Down Expand Up @@ -224,4 +246,18 @@ defmodule ExDoc.Config do
defp append_slash(url) do
if :binary.last(url) == ?/, do: url, else: url <> "/"
end

defp default_debug_info_fn(key) do
key =
case key do
{_mode, key} -> to_charlist(key)
key -> to_charlist(key)
end

fn
:init -> :ok
:clear -> :ok
{:debug_info, _mode, _module, _filename} -> key
end
end
end
21 changes: 19 additions & 2 deletions lib/ex_doc/retriever.ex
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ defmodule ExDoc.Retriever do
end

defp get_module(module, config) do
with {:docs_v1, _, language, _, _, _metadata, _} = docs_chunk <- docs_chunk(module),
with {:docs_v1, _, language, _, _, _metadata, _} = docs_chunk <- docs_chunk(module, config),
{:ok, language} <- ExDoc.Language.get(language, module),
%{} = module_data <- language.module_data(module, docs_chunk, config) do
{:ok, generate_node(module, module_data, config)}
Expand All @@ -90,7 +90,11 @@ defmodule ExDoc.Retriever do
end
end

defp docs_chunk(module) do
defp docs_chunk(module, config) do
if debug_info_fn = config.debug_info_fn do
set_crypto_key_fn(debug_info_fn)
end

result = Code.fetch_docs(module)
Refs.insert_from_chunk(module, result)

Expand Down Expand Up @@ -496,4 +500,17 @@ defmodule ExDoc.Retriever do
defp source_link(source, line) do
Utils.source_url_pattern(source.url, source.path |> Path.relative_to(File.cwd!()), line)
end

@doc false
def set_crypto_key_fn(crypto_key_fn) do
:beam_lib.clear_crypto_key_fun()

case :beam_lib.crypto_key_fun(crypto_key_fn) do
{:error, reason} ->
raise Error, "failed to set crypto_key_fun: #{inspect(reason)}"

other ->
other
end
end
end
18 changes: 18 additions & 0 deletions lib/mix/tasks/docs.ex
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,16 @@ defmodule Mix.Tasks.Docs do
the "assets" directory in the output path under the name "cover" and the
appropriate extension. This option has no effect when using the "html" formatter.

* `:debug_info_key` - The key to be used to decrypt debug info that was encrypted during
compilation. This option will be ignored if `:debug_info_fn` or `:debug_info_fun` is provided.
See [Encrypted debug info](`m:Mix.Tasks.Docs#module-encrypted-debug-info`).

* `:debug_info_fn` / `:debug_info_fun` - A function that will be provided to
`:beam_lib.crypto_key_fun/1` to decrypt debug info that was encrypted during compilation. If
both `:debug_info_fn` and `:debug_info_fun` are provided, `:debug_info_fun` will be ignored.
If this option is provided, `:debug_info_key` will be ignored. See
[Encrypted debug info](`m:Mix.Tasks.Docs#module-encrypted-debug-info`).

* `:deps` - A keyword list application names and their documentation URL.
ExDoc will by default include all dependencies and assume they are hosted on
HexDocs. This can be overridden by your own values. Example: `[plug: "https://myserver/plug/"]`
Expand Down Expand Up @@ -200,6 +210,14 @@ defmodule Mix.Tasks.Docs do
where path is either an relative path from the cwd, or an absolute path. The function
must return the full URI as it should be placed in the documentation.

## Encrypted debug info

If a module is compiled with [encrypted debug info](`:compile.file/2`), ExDoc will not be able to
extract its documentation without preparation. ExDoc supports using `.erlang.crypt` to decrypt
debug information. Consult the
[`.erlang.crypt` section in the `:beam_lib` documentation](`m::beam_lib#module-erlang-crypt`)
for more information.

## Groups

ExDoc content can be organized in groups. This is done via the `:groups_for_extras`
Expand Down
54 changes: 54 additions & 0 deletions test/ex_doc/config_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,58 @@ defmodule ExDoc.ConfigTest do
assert config.skip_code_autolink_to.("ConfigTest.Hidden.bar/1")
refute config.skip_code_autolink_to.("ConfigTest.NotHidden")
end

test "produces a function when a debug_info_key is provided" do
config = ExDoc.Config.build(@project, @version, debug_info_key: "Hunter2")

assert config.debug_info_fn.(:init) == :ok
assert config.debug_info_fn.(:clear) == :ok
assert config.debug_info_fn.({:debug_info, nil, nil, nil}) == ~c"Hunter2"

config = ExDoc.Config.build(@project, @version, debug_info_key: {:des3_cbc, "Hunter3"})

assert config.debug_info_fn.(:init) == :ok
assert config.debug_info_fn.(:clear) == :ok
assert config.debug_info_fn.({:debug_info, nil, nil, nil}) == ~c"Hunter3"
end

test "ignores debug_info_key when debug_info_fn or debug_info_fun is provided" do
config =
ExDoc.Config.build(@project, @version,
debug_info_key: "Hunter2",
debug_info_fn: debug_info_fn(~c"foxtrot")
)

assert config.debug_info_fn.({:debug_info, nil, nil, nil}) == ~c"foxtrot"

config =
ExDoc.Config.build(@project, @version,
debug_info_key: "Hunter2",
debug_info_fun: debug_info_fn(~c"tango")
)

assert config.debug_info_fn.({:debug_info, nil, nil, nil}) == ~c"tango"
end

test "handles either debug_info_fn or debug_info_fun, but debug_info_fn takes precedence" do
config =
ExDoc.Config.build(@project, @version,
debug_info_fun: debug_info_fn(~c"fun"),
debug_info_fn: debug_info_fn(~c"fn")
)

assert config.debug_info_fn.({:debug_info, nil, nil, nil}) == ~c"fn"

config = ExDoc.Config.build(@project, @version, debug_info_fun: debug_info_fn(~c"fun"))

assert config.debug_info_fn.({:debug_info, nil, nil, nil}) == ~c"fun"
end

defp debug_info_fn(key) do
fn
:init -> :ok
:clear -> :ok
{:debug_info, _mode, _module, _filename} -> key
end
end
end
111 changes: 111 additions & 0 deletions test/ex_doc/retriever/erlang_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,62 @@
~r'Equivalent to <a href="`function2/1`"><code[^>]+>function2\(\[\{test, args\}\]\).*\.'
end

test "with encrypted debug_info", c do
erlc(
c,
:debug_info_mod,
~S"""
-module(debug_info_mod).
-moduledoc("mod docs.").
-export([function1/0]).
-export_type([foo/0]).

-doc("foo/0 docs.").
-type foo() :: atom().

-doc("function1/0 docs.").
-spec function1() -> atom().
function1() -> ok.
""",
debug_info_key: ~c"SECRET"
)

config = ExDoc.Config.build("debug_info_mod", 1, debug_info_key: ~c"SECRET")

{[mod], []} = Retriever.docs_from_modules([:debug_info_mod], config)

assert %ExDoc.ModuleNode{
moduledoc_file: moduledoc_file,
docs: [function1],
id: "debug_info_mod",
module: :debug_info_mod,
title: "debug_info_mod",
typespecs: [foo]
} = mod

assert DocAST.to_string(mod.doc) =~ "mod docs."
assert DocAST.to_string(function1.doc) =~ "function1/0 docs."
assert DocAST.to_string(foo.doc) =~ "foo/0 docs."
assert moduledoc_file =~ "debug_info_mod.erl"
end

test "encrypted with tuple key", c do
erlc(
c,
:debug_info_mod2,
~S"""
-module(debug_info_mod2).
-moduledoc("mod docs.").
""",
debug_info_key: {:des3_cbc, ~c"SECRET"}
)

config = ExDoc.Config.build("debug_info_mod2", 1, debug_info_key: {:des3_cbc, "SECRET"})

assert {[%ExDoc.ModuleNode{module: :debug_info_mod2}], []} =
Retriever.docs_from_modules([:debug_info_mod2], config)
end

test "module included files", c do
erlc(c, :mod, ~S"""
-file("module.hrl", 1).
Expand Down Expand Up @@ -354,6 +410,61 @@
|> Erlang.autolink_spec(current_module: :mod, current_kfa: {:type, :type, 0}) ==
"type() :: #a{a :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:pos_integer/0\">pos_integer</a>(), b :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:non_neg_integer/0\">non_neg_integer</a>(), c :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:atom/0\">atom</a>(), d :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:term/0\">term</a>(), e :: <a href=\"https://www.erlang.org/doc/apps/erts/erlang.html#t:term/0\">term</a>()}."
end

@tag :ci
test "modules with encrypted debug info", c do

Check failure on line 415 in test/ex_doc/retriever/erlang_test.exs

View workflow job for this annotation

GitHub Actions / mix_test (1.17, 27, lint)

test docs_from_modules/2 modules with encrypted debug info (ExDoc.Retriever.ErlangTest)
File.cp!("test/fixtures/.erlang.crypt", ".erlang.crypt")

erlc(
c,
:debug_info_mod,
~S"""
-module(debug_info_mod).
-moduledoc("mod docs.").
-export([function1/0]).
-export_type([foo/0]).

-doc("foo/0 docs.").
-type foo() :: atom().

-doc("function1/0 docs.").
-spec function1() -> atom().
function1() -> ok.
""",
debug_info_key: ~c"SECRET"
)

{[mod], []} = Retriever.docs_from_modules([:debug_info_mod], %ExDoc.Config{})

assert %ExDoc.ModuleNode{
moduledoc_file: moduledoc_file,
docs: [function1],
id: "debug_info_mod",
module: :debug_info_mod,
title: "debug_info_mod",
typespecs: [foo]
} = mod

assert DocAST.to_string(mod.doc) =~ "mod docs."
assert DocAST.to_string(function1.doc) =~ "function1/0 docs."
assert DocAST.to_string(foo.doc) =~ "foo/0 docs."
assert moduledoc_file =~ "debug_info_mod.erl"

erlc(
c,
:debug_info_mod2,
~S"""
-module(debug_info_mod2).
-moduledoc("mod docs.").
""",
debug_info_key: {:des3_cbc, ~c"PASSWORD"}
)

assert {[%ExDoc.ModuleNode{module: :debug_info_mod2}], []} =
Retriever.docs_from_modules([:debug_info_mod2], %ExDoc.Config{})

File.rm!(".erlang.crypt")
end
end

describe "docs_from_modules/2 edoc" do
Expand Down
10 changes: 10 additions & 0 deletions test/ex_doc/retriever_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -307,4 +307,14 @@ defmodule ExDoc.RetrieverTest do
%{docs: [%{signature: signature}]} = module_node
assert signature == "callback_name(arg1, integer, %Date{}, term, t)"
end

test "set_crypto_key_fn/1 raises if it receives an error" do
assert_raise(
Retriever.Error,
"failed to set crypto_key_fun: :badfun",
fn ->
Retriever.set_crypto_key_fn(fn _ -> {:error, :badfun} end)
end
)
end
end
2 changes: 2 additions & 0 deletions test/fixtures/.erlang.crypt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[{debug_info, des3_cbc, debug_info_mod, "SECRET"},
{debug_info, des3_cbc, [], "PASSWORD"}].
Loading
Loading