admin/tailscale
1
0 Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-10-23 03:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tsidp: replace deprecated go-jose library

Browse Source 
Updates tailscale/corp#49953

Signed-off-by: Adriano Sela Aviles <adriano@tailscale.com>
This commit is contained in:
Adriano Sela Aviles authored and Adriano Sela Aviles committed 2026-10-13 15:18:09 -07:00
1 parent aaaaa97189
commit 40d0abcffb
8 files changed
+18 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmd/tsidp/depaware.txt
+5 -7
View File
@@ -24,6 +24,10 @@ tailscale.com/cmd/tsidp dependencies: (generated by github.com/tailscale/depawar
github.com/gaissmai/bart/internal/nodes from github.com/gaissmai/bart
github.com/gaissmai/bart/internal/sparse from github.com/gaissmai/bart/internal/nodes
github.com/gaissmai/bart/internal/value from github.com/gaissmai/bart+
github.com/go-jose/go-jose/v4 from github.com/go-jose/go-jose/v4/jwt+
github.com/go-jose/go-jose/v4/cipher from github.com/go-jose/go-jose/v4
github.com/go-jose/go-jose/v4/json from github.com/go-jose/go-jose/v4+
github.com/go-jose/go-jose/v4/jwt from tailscale.com/cmd/tsidp
github.com/go-json-experiment/json from tailscale.com/types/opt+
github.com/go-json-experiment/json/jsontext from tailscale.com/drive+
github.com/go-json-experiment/json/v1 from tailscale.com/net/routecheck+
@@ -78,10 +82,6 @@ tailscale.com/cmd/tsidp dependencies: (generated by github.com/tailscale/depawar
go4.org/netipx from tailscale.com/ipn/ipnlocal+
W 💣 golang.zx2c4.com/wintun from github.com/tailscale/wireguard-go/tun
W 💣 golang.zx2c4.com/wireguard/windows/tunnel/winipcfg from tailscale.com/net/dns+
gopkg.in/square/go-jose.v2 from gopkg.in/square/go-jose.v2/jwt+
gopkg.in/square/go-jose.v2/cipher from gopkg.in/square/go-jose.v2
gopkg.in/square/go-jose.v2/json from gopkg.in/square/go-jose.v2+
gopkg.in/square/go-jose.v2/jwt from tailscale.com/cmd/tsidp
gvisor.dev/gvisor/pkg/atomicbitops from gvisor.dev/gvisor/pkg/buffer+
gvisor.dev/gvisor/pkg/bits from gvisor.dev/gvisor/pkg/buffer
💣 gvisor.dev/gvisor/pkg/buffer from gvisor.dev/gvisor/pkg/tcpip+
@@ -342,13 +342,11 @@ tailscale.com/cmd/tsidp dependencies: (generated by github.com/tailscale/depawar
golang.org/x/crypto/chacha20 from golang.org/x/crypto/chacha20poly1305
golang.org/x/crypto/chacha20poly1305 from github.com/tailscale/wireguard-go/device+
golang.org/x/crypto/curve25519 from github.com/tailscale/wireguard-go/device+
golang.org/x/crypto/ed25519 from gopkg.in/square/go-jose.v2
golang.org/x/crypto/hkdf from tailscale.com/control/controlbase
golang.org/x/crypto/internal/alias from golang.org/x/crypto/chacha20+
golang.org/x/crypto/internal/poly1305 from golang.org/x/crypto/chacha20poly1305+
golang.org/x/crypto/nacl/box from tailscale.com/types/key
golang.org/x/crypto/nacl/secretbox from golang.org/x/crypto/nacl/box
golang.org/x/crypto/pbkdf2 from gopkg.in/square/go-jose.v2
golang.org/x/crypto/poly1305 from github.com/tailscale/wireguard-go/device
golang.org/x/crypto/salsa20/salsa from golang.org/x/crypto/nacl/box+
golang.org/x/exp/constraints from github.com/dblohm7/wingoes/pe+
@@ -464,7 +462,7 @@ tailscale.com/cmd/tsidp dependencies: (generated by github.com/tailscale/depawar
crypto/md5 from crypto/tls+
crypto/mldsa from crypto/tls+
crypto/mlkem from crypto/hpke+
crypto/pbkdf2 from golang.org/x/crypto/pbkdf2
crypto/pbkdf2 from github.com/go-jose/go-jose/v4
crypto/rand from crypto/ed25519+
crypto/rc4 from crypto/tls
crypto/rsa from crypto/tls+
cmd/tsidp/tsidp.go
+3 -3
View File
@@ -35,8 +35,8 @@ import (
"sync"
"time"
"gopkg.in/square/go-jose.v2"
"gopkg.in/square/go-jose.v2/jwt"
"github.com/go-jose/go-jose/v4"
"github.com/go-jose/go-jose/v4/jwt"
"tailscale.com/client/local"
"tailscale.com/client/tailscale/apitype"
"tailscale.com/envknob"
@@ -980,7 +980,7 @@ func (s *idpServer) serveToken(w http.ResponseWriter, r *http.Request) {
}
// Create an OIDC token using this issuer's signer.
token, err := jwt.Signed(signer).Claims(tsClaimsWithExtra).CompactSerialize()
token, err := jwt.Signed(signer).Claims(tsClaimsWithExtra).Serialize()
if err != nil {
log.Printf("Error getting token: %v", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
cmd/tsidp/tsidp_test.go
+3 -3
View File
@@ -37,8 +37,8 @@ import (
"testing"
"time"
"gopkg.in/square/go-jose.v2"
"gopkg.in/square/go-jose.v2/jwt"
"github.com/go-jose/go-jose/v4"
"github.com/go-jose/go-jose/v4/jwt"
"tailscale.com/client/local"
"tailscale.com/client/tailscale/apitype"
"tailscale.com/tailcfg"
@@ -679,7 +679,7 @@ func TestServeToken(t *testing.T) {
t.Fatalf("failed to unmarshal response: %v", err)
}
tok, err := jwt.ParseSigned(resp.IDToken)
tok, err := jwt.ParseSigned(resp.IDToken, []jose.SignatureAlgorithm{jose.RS256})
if err != nil {
t.Fatalf("failed to parse ID token: %v", err)
}
flake.nix
+1 -1
View File
@@ -173,4 +173,4 @@
});
};
}
# nix-direnv cache busting line: sha256-PBb0Yl9h7q21nNUl77VjkpVXs+P+9Aq9PcKeO/2757k=
# nix-direnv cache busting line: sha256-ttPdlLvTB5d1rs9OZNkvnMEVTt1g9vX/JQ78jXm5nRQ=
flakehashes.json
+2 -2
View File
@@ -4,7 +4,7 @@
"sri": "sha256-JcOxcYFhNRg6fiQhe5GkPHQxLI0ypKClCShZcBY1920="
},
"vendor": {
"goModSum": "sha256-g4cfH/XJVAziy5AsZbH17OPxwcQeyo5BsNr7yjoSii0=",
"sri": "sha256-PBb0Yl9h7q21nNUl77VjkpVXs+P+9Aq9PcKeO/2757k="
"goModSum": "sha256-klRxJ6OE8uxJ9cdR/XTELcoXl/b9viZE+JgDZtkEGkw=",
"sri": "sha256-ttPdlLvTB5d1rs9OZNkvnMEVTt1g9vX/JQ78jXm5nRQ="
}
}
go.mod
+1 -1
View File
@@ -49,6 +49,7 @@ require (
github.com/fsnotify/fsnotify v1.10.1
github.com/fxamacker/cbor/v2 v2.9.3
github.com/gaissmai/bart v0.29.0
github.com/go-jose/go-jose/v4 v4.1.4
github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3
github.com/go-logr/zapr v1.3.0
github.com/go-ole/go-ole v1.3.0
@@ -151,7 +152,6 @@ require (
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2
golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446
golang.zx2c4.com/wireguard/windows v1.0.1
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/yaml.v3 v3.0.1
gvisor.dev/gvisor v0.0.0-20260915211658-a6f909f08a72
helm.sh/helm/v3 v3.21.4
go.sum
+2 -2
View File
@@ -408,6 +408,8 @@ github.com/go-git/go-git/v5 v5.19.1 h1:nX27AnaU43/K5bKktKwgBmR9lawoYVe1Ckg0rgzzN
github.com/go-git/go-git/v5 v5.19.1/go.mod h1:Pb1v0c7/g8aGQJwx9Us09W85yGoyvSwuhEGMH7zjDKQ=
github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs=
github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpjH8TixEw=
github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3 h1:UADEEmDKgfXbtnGJZ97beY5XLo9ZechG1nlU4KnRrkE=
github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3/go.mod h1:tphK2c80bpPhMOI4v6bIc2xWywPfbqi1Z06+RcrMkDg=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -1468,8 +1470,6 @@ gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY=
gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
shell.nix
+1 -1
View File
@@ -16,4 +16,4 @@
) {
src = ./.;
}).shellNix
# nix-direnv cache busting line: sha256-PBb0Yl9h7q21nNUl77VjkpVXs+P+9Aq9PcKeO/2757k=
# nix-direnv cache busting line: sha256-ttPdlLvTB5d1rs9OZNkvnMEVTt1g9vX/JQ78jXm5nRQ=