git.iko.soy/typeable/nixpkgs
on master help sign in
oauth2_proxy: 5.1.1 -> 6.0.0 (#93121)

The new release fixes one of the outstanding CVEs against oauth2_proxy: https://github.com/oauth2-proxy/oauth2-proxy/security/advisories/GHSA-5m6c-jp6f-2vcv. In addition, rename the owner and the project name to reflect the changes upstream (it now belongs to the oauth2-proxy organization, and the name is oauth2-proxy)

commit53f42f245af191cb5b1fc9e174c76d2a98b9f96f authorNikola Knežević <nikola@knezevic.ch> dateMon 20 Jul 2020, 07:08 (6 years ago) parent902987d
2 files changed+11−9
nixos/modules/services/security/oauth2_proxy.nix+7−5 pkgs/servers/oauth2_proxy/default.nix+4−4
nixos/modules/services/security/oauth2_proxy.nix+7−5
@@ -99,7 +99,7 @@ in
9999
100100 ##############################################
101101 # PROVIDER configuration
102− # Taken from: https://github.com/pusher/oauth2_proxy/blob/master/providers/providers.go
102+ # Taken from: https://github.com/oauth2-proxy/oauth2-proxy/blob/master/providers/providers.go
103103 provider = mkOption {
104104 type = types.enum [
105105 "google"
@@ -346,7 +346,9 @@ in
346346 type = types.nullOr types.str;
347347 default = null;
348348 description = ''
349− An optional cookie domain to force cookies to.
349+ Optional cookie domains to force cookies to (ie: `.yourcompany.com`).
350+ The longest domain matching the request's host will be used (or the shortest
351+ cookie domain if there is no match).
350352 '';
351353 example = ".yourcompany.com";
352354 };
@@ -537,7 +539,7 @@ in
537539 extraConfig = mkOption {
538540 default = {};
539541 description = ''
540− Extra config to pass to oauth2_proxy.
542+ Extra config to pass to oauth2-proxy.
541543 '';
542544 };
543545
@@ -545,7 +547,7 @@ in
545547 type = types.nullOr types.path;
546548 default = null;
547549 description = ''
548− oauth2_proxy allows passing sensitive configuration via environment variables.
550+ oauth2-proxy allows passing sensitive configuration via environment variables.
549551 Make a file that contains lines like
550552 OAUTH2_PROXY_CLIENT_SECRET=asdfasdfasdf.apps.googleuserscontent.com
551553 and specify the path here.
@@ -577,7 +579,7 @@ in
577579 serviceConfig = {
578580 User = "oauth2_proxy";
579581 Restart = "always";
580− ExecStart = "${cfg.package}/bin/oauth2_proxy ${configString}";
582+ ExecStart = "${cfg.package}/bin/oauth2-proxy ${configString}";
581583 EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile;
582584 };
583585 };
pkgs/servers/oauth2_proxy/default.nix+4−4
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "oauth2-proxy";
5− version = "5.1.1";
5+ version = "6.0.0";
66
77 src = fetchFromGitHub {
88 repo = pname;
9− owner = "pusher";
10− sha256 = "190k1v2c1f6vp9waqs01rlzm0jc3vrmsq1w1n0c2q2nfqx76y2wz";
9+ owner = "oauth2-proxy";
10+ sha256 = "0mbjg0d0w173xpq69frjdvgyx5k74pkrfx3phc3lq8snvhnf1c2n";
1111 rev = "v${version}";
1212 };
1313
14− vendorSha256 = "01lf7xbhgn5l42ahym12vr1w00zx1qzy6sgwgcbvvxp48k0b271d";
14+ vendorSha256 = "1hrk3h729kcc77fq44kiywmyzk5a78v7bm5d2yl76lfxxdcdric7";
1515
1616 doCheck = true;
1717