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

simp_le: 0.6.1 -> 0.8.0 #37493

Merged
merged 4 commits into from Mar 21, 2018
Merged

simp_le: 0.6.1 -> 0.8.0 #37493

merged 4 commits into from Mar 21, 2018

Conversation

makefu
Copy link
Contributor

@makefu makefu commented Mar 20, 2018

Motivation for this change

according to the changelog, the release 0.6.2 of simp_le will be future-proof by not hard-coding the TOS checksum.
To update simp_le, the latest version is required which is bumped by this PR. Additionally josepy is added which is required for simp_le and certbot.
related: #31944

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@makefu makefu requested a review from FRidh as a code owner March 20, 2018 21:32
@makefu
Copy link
Contributor Author

makefu commented Mar 20, 2018

@GrahamcOfBorg build simp_le certbot

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: simp_le, certbot

Partial log (click to expand)

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

IMPORTANT NOTES:
 - If you like Certbot, please consider supporting our work by:

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

error: build of '/nix/store/fkmcxy3jjymzhidv7c9b9l6i551rm5a2-simp_le-client-0.8.0.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: simp_le, certbot

Partial log (click to expand)

   Donating to EFF:                    https://eff.org/donate-le

IMPORTANT NOTES:
 - If you like Certbot, please consider supporting our work by:

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

/nix/store/vjrj643401n3b0iqs7q1cz3jkxri9m41-simp_le-client-0.8.0
/nix/store/mzbqw35qyn09ar2jpckvhcn75r0lficp-certbot-0.22.2

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: certbot, simp_le

Partial log (click to expand)

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

IMPORTANT NOTES:
 - If you like Certbot, please consider supporting our work by:

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

error: build of '/nix/store/6l91ci1gvp1pgszx4d6hi6dymdmnyx3x-simp_le-client-0.8.0.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: certbot, simp_le

Partial log (click to expand)

/nix/store/mzbqw35qyn09ar2jpckvhcn75r0lficp-certbot-0.22.2
/nix/store/vjrj643401n3b0iqs7q1cz3jkxri9m41-simp_le-client-0.8.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: simp_le, certbot

Partial log (click to expand)


   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

IMPORTANT NOTES:
 - If you like Certbot, please consider supporting our work by:

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: certbot, simp_le

Partial log (click to expand)

/nix/store/ml590087glxdncjcgajnyrd8as3jj5sm-certbot-0.22.2
/nix/store/zbr3cn5s1fgkvlhswipisdgdzfhy66sl-simp_le-client-0.8.0

@makefu
Copy link
Contributor Author

makefu commented Mar 21, 2018

simp_le-client fails on darwitn with

ERROR: test_no_persisted_empty (simp_le.ExternalIOPluginTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/nix/store/5myi8sjqdhii0wsrcrjaw1pkzc14hmnj-simp_le-client-0.8.0/lib/python2.7/site-packages/simp_le.py", line 886, in test_no_persisted_empty
    self.assertEqual(IOPlugin.EMPTY_DATA, self.plugin.load())
  File "/nix/store/5myi8sjqdhii0wsrcrjaw1pkzc14hmnj-simp_le-client-0.8.0/lib/python2.7/site-packages/simp_le.py", line 654, in load
    pems = list(self.split_pems(self.get_output_or_fail('load')))
  File "/nix/store/5myi8sjqdhii0wsrcrjaw1pkzc14hmnj-simp_le-client-0.8.0/lib/python2.7/site-packages/simp_le.py", line 629, in get_output_or_fail
    raise Error('Failed to execute external script: {0}'.format(error))
Error: Failed to execute external script: [Errno 8] Exec format error

not sure how to fix it. should i disable this test for darwin? everything else looks fine

@makefu
Copy link
Contributor Author

makefu commented Mar 21, 2018

/cc @dotlambda @disassembler

@dotlambda
Copy link
Member

I noticed some /bin/sh stuff in simp_le.py. No idea if that's the reason but it should be fixed anyway.

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: certbot, simp_le

Partial log (click to expand)

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

IMPORTANT NOTES:
 - If you like Certbot, please consider supporting our work by:

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

error: build of '/nix/store/rc6vwszbkh78v3v0p4g6w88bwp8y8sax-simp_le-client-0.8.0.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: certbot, simp_le

Partial log (click to expand)

   Donating to EFF:                    https://eff.org/donate-le

IMPORTANT NOTES:
 - If you like Certbot, please consider supporting our work by:

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

/nix/store/ml590087glxdncjcgajnyrd8as3jj5sm-certbot-0.22.2
/nix/store/di9lpv6750sv3f48fh2gw883g7afvbz8-simp_le-client-0.8.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: certbot, simp_le

Partial log (click to expand)

   Donating to EFF:                    https://eff.org/donate-le

IMPORTANT NOTES:
 - If you like Certbot, please consider supporting our work by:

   Donating to ISRG / Let's Encrypt:   https://letsencrypt.org/donate
   Donating to EFF:                    https://eff.org/donate-le

/nix/store/mzbqw35qyn09ar2jpckvhcn75r0lficp-certbot-0.22.2
/nix/store/92vfwxa4pkl2gk9wax431awsl3jhmplw-simp_le-client-0.8.0

@Mic92 Mic92 merged commit f2feb99 into NixOS:master Mar 21, 2018
@wmertens
Copy link
Contributor

It would be nice to backport this to stable too

@Mic92 Mic92 added this to the 18.03 milestone Mar 22, 2018
@Mic92
Copy link
Member

Mic92 commented Mar 22, 2018

Currently I a don't have time to do this, but maybe someone else.

@dotlambda
Copy link
Member

This breaks the acme module:
@GrahamcOfBorg test acme

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: tests.acme

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: tests.acme

Partial log (click to expand)

error: command `curl https://example.com/ | grep -qF "hello world"' did not succeed (exit code 1)
command `curl https://example.com/ | grep -qF "hello world"' did not succeed (exit code 1)
cleaning up
killing webserver (pid 616)
killing letsencrypt (pid 593)
killing client (pid 627)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
builder for '/nix/store/cxwb1wwyza4kvggsc7z8k0jaass8hlnn-vm-test-run-acme.drv' failed with exit code 255
error: build of '/nix/store/cxwb1wwyza4kvggsc7z8k0jaass8hlnn-vm-test-run-acme.drv' failed

@wmertens
Copy link
Contributor

The reason seems to be simp_le: error: unrecognized arguments: --tos_sha256 cc88d8d9517f490191401e7b54e9ffd12a2b9082ec7a1d4cec6101f9f1647e7b

It doesn't use that argument any more, so the test needs to be adjusted.

@makefu
Copy link
Contributor Author

makefu commented Mar 22, 2018

@wmertens exactly, with 0.6.2 the TOS shasum will not be hardcoded anymore. See changelog 0.7.0 on https://pypi.python.org/pypi/simp-le-client . the client implicitly agrees with the TOS if one is is presented

@makefu makefu deleted the pkgs/simp_le/0.8.0 branch March 22, 2018 14:15
@makefu makefu restored the pkgs/simp_le/0.8.0 branch March 22, 2018 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants