Put base64 url en-/decoding more central and use this method everywhere. Enable checkSignature: also to handle complete token or splitted

noha · noha · commit a0a95e1c5f29 · 2022-04-06T12:01:19.000+02:00
diff --git a/source/JSONWebToken-Core.package/JWAHMACSHA256.class/class/checkSignatureOfParts.withKey..st b/source/JSONWebToken-Core.package/JWAHMACSHA256.class/class/checkSignatureOfParts.withKey..st
@@ -1,5 +1,5 @@
 sign
-checkSignature: parts withKey: key
+checkSignatureOfParts: parts withKey: key
 	(self
 		signMessage:
 			($.
diff --git a/source/JSONWebToken-Core.package/JWANone.class/class/checkSignature.withKey..st b/source/JSONWebToken-Core.package/JWANone.class/class/checkSignature.withKey..st
diff --git a/source/JSONWebToken-Core.package/JWANone.class/class/checkSignatureOfParts.withKey..st b/source/JSONWebToken-Core.package/JWANone.class/class/checkSignatureOfParts.withKey..st
@@ -0,0 +1,3 @@
+sign
+checkSignatureOfParts: parts withKey: key
+	
diff --git a/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/materialize.key.checkSignature..st b/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/materialize.key.checkSignature..st
@@ -5,10 +5,10 @@ materialize: aString key: aKeyString checkSignature: checkSignature
 
 	parts := $. split: aString.
 	(parts size = 3) ifFalse: [ JWSInvalidTokenFormat signal: 'the format of the token is invalid' ].
-	header := JWSHeader fromJson: ( self base64Decoded: parts first ) utf8Decoded.
+	header := JWSHeader fromJson: ( self class base64UrlDecoded: parts first ) utf8Decoded.
 	jws := JsonWebSignature new
 		key: aKeyString;
 		setProtectedHeader: header.
 	checkSignature
 		ifTrue: [ jws checkSignature: parts ].
-	^ jws payload: ( JWTClaimsSet fromJson: ( self base64Decoded: parts second ) utf8Decoded )
+	^ jws payload: ( JWTClaimsSet fromJson: ( self class base64UrlDecoded: parts second ) utf8Decoded )
diff --git a/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/serialize..st b/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/serialize..st
@@ -8,5 +8,5 @@ serialize: aWebSignature
 	signature := aWebSignature signatureFor: stream contents.
 	stream
 		nextPut: $.;
-		nextPutAll: (self base64Encoded: signature).
+		nextPutAll: (self class base64UrlEncoded: signature).
 	^ stream contents
diff --git a/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/writeHeader..st b/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/writeHeader..st
@@ -1,3 +1,3 @@
 writing
 writeHeader: aHeader 
-	stream nextPutAll: (self base64Encoded: aHeader asJson asByteArray) 
+	stream nextPutAll: (self class base64UrlEncoded: aHeader asJson asByteArray) 
diff --git a/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/writePayload..st b/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/writePayload..st
@@ -1,3 +1,3 @@
 writing
 writePayload: anObject
-	stream nextPutAll: (self base64Encoded: anObject asJson asByteArray) 
+	stream nextPutAll: (self class base64UrlEncoded: anObject asJson asByteArray) 
diff --git a/source/JSONWebToken-Core.package/JWSSerializer.class/class/base64UrlDecoded..st b/source/JSONWebToken-Core.package/JWSSerializer.class/class/base64UrlDecoded..st
@@ -1,5 +1,5 @@
 conversion
-base64Decoded: aBase64String
+base64UrlDecoded: aBase64String
 
 	"According to https://tools.ietf.org/html/rfc7519#page-4 the encoding needs to be base64Url.
 	The padding can be stripped as it is not used for transport in JWT, so we need to pad it just in case"
diff --git a/source/JSONWebToken-Core.package/JWSSerializer.class/class/base64UrlEncoded..st b/source/JSONWebToken-Core.package/JWSSerializer.class/class/base64UrlEncoded..st
@@ -1,5 +1,5 @@
 conversion
-base64Encoded: aByteArray
+base64UrlEncoded: aByteArray
 
 	"According to https://tools.ietf.org/html/rfc7519#page-4 the encoding needs to be base64Url.
 	The padding is stripped as it is not used for transport in JWT"
diff --git a/source/JSONWebToken-Core.package/JsonWebAlgorithm.class/class/checkSignature.withKey..st b/source/JSONWebToken-Core.package/JsonWebAlgorithm.class/class/checkSignature.withKey..st
@@ -0,0 +1,8 @@
+sign
+checkSignature: token withKey: key
+	"keep this method backward compatible also accepting already splitted parts"
+	self 
+		checkSignatureOfParts: (token isString 
+			ifTrue: [ $. split: token ]
+			ifFalse: [ token ])
+		withKey: key
diff --git a/source/JSONWebToken-Core.package/JsonWebAlgorithm.class/class/checkSignatureOfParts.withKey..st b/source/JSONWebToken-Core.package/JsonWebAlgorithm.class/class/checkSignatureOfParts.withKey..st
@@ -0,0 +1,3 @@
+sign
+checkSignatureOfParts: parts withKey: key
+	self subclassResponsibility 
diff --git a/source/JSONWebToken-Core.package/JsonWebSignature.class/instance/base64UrlDecoded..st b/source/JSONWebToken-Core.package/JsonWebSignature.class/instance/base64UrlDecoded..st
@@ -1,4 +1,4 @@
 private
-base64Decoded: aBase64String
+base64UrlDecoded: aBase64String
 
 	^ Base64UrlEncoder new decode: aBase64String base64Padded
diff --git a/source/JSONWebToken-OpenSSL.package/JWARSASHA256.class/class/checkSignatureOfParts.withKey..st b/source/JSONWebToken-OpenSSL.package/JWARSASHA256.class/class/checkSignatureOfParts.withKey..st
@@ -1,12 +1,11 @@
 sign
-checkSignature: parts withKey: key
+checkSignatureOfParts: parts withKey: key
 	| jwtHeaderAndPayload signatureByteArray publicKey |
 	jwtHeaderAndPayload := $.
 		join:
 			{parts first.
 			parts second}.
-	signatureByteArray := parts third base64Padded base64Decoded
-		asByteArray.
+	signatureByteArray := JWSSerializer base64UrlDecoded: parts third "base64Padded base64Decoded".
 	publicKey := (key includesSubstring: 'BEGIN RSA PUBLIC KEY')
 		ifTrue: [ LcEvpPublicKey setRSA:  (LcRSA fromRsaPublicKeyPemString: key) ]
 		ifFalse: [ LcEvpPublicKey fromPublicKeyPemString: key ].

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+sign`
	`2`	`+checkSignatureOfParts: parts withKey: key`
	`3`	`+`