Added class for header algorithm RS256. The class does not yet implem…

…ent the RSA signing. Additionally a switch for checking signature has been added. So it can be used with non-checking in case of RSA
noha · Nov 24, 2017 · 4a4d20e · 4a4d20e
1 parent 555aa68
commit 4a4d20e
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 17 deletions.
diff --git a/source/JSONWebToken-Core.package/JWARSASHA256.class/README.md b/source/JSONWebToken-Core.package/JWARSASHA256.class/README.md
diff --git a/source/JSONWebToken-Core.package/JWARSASHA256.class/class/parameterValue.st b/source/JSONWebToken-Core.package/JWARSASHA256.class/class/parameterValue.st
@@ -0,0 +1,3 @@
+accessing
+parameterValue
+	^ 'RS256'
diff --git a/source/JSONWebToken-Core.package/JWARSASHA256.class/class/signMessage.withKey..st b/source/JSONWebToken-Core.package/JWARSASHA256.class/class/signMessage.withKey..st
@@ -0,0 +1,3 @@
+sign
+signMessage: aString withKey: anObject
+	self notYetImplemented 
diff --git a/source/JSONWebToken-Core.package/JWARSASHA256.class/properties.json b/source/JSONWebToken-Core.package/JWARSASHA256.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "JsonWebAlgorithm",
+	"category" : "JSONWebToken-Core-JSONWebToken-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "JWARSASHA256",
+	"type" : "normal"
+}
diff --git a/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/materialize..st b/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/materialize..st
diff --git a/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/materialize.key..st b/source/JSONWebToken-Core.package/JWSCompactSerializer.class/instance/materialize.key..st
@@ -1,11 +1,3 @@
 reading
 materialize: aString key: aKeyString
-	| parts header jws  |
-	parts := $. split: aString.
-	header := JWSHeader fromJson: (parts at: 1) base64Decoded.
-	jws := JsonWebSignature new
-		key: aKeyString;
-		setProtectedHeader: header.
-	((jws signatureFor: ($. join: { parts first . parts second })) = parts third base64Decoded asByteArray) ifFalse: [
-		Error signal: 'signature does not match' ].
-	^ jws payload: (JWTClaimsSet fromJson: parts second base64Decoded) 
+	^ self materialize: aString key: aKeyString checkSignature: true 
diff --git a/...Token-Core.package/JWSCompactSerializer.class/instance/materialize.key.checkSignature..st b/...Token-Core.package/JWSCompactSerializer.class/instance/materialize.key.checkSignature..st
@@ -0,0 +1,11 @@
+reading
+materialize: aString key: aKeyString checkSignature: checkSignature
+	| parts header jws  |
+	parts := $. split: aString.
+	header := JWSHeader fromJson: (parts at: 1) base64Decoded.
+	jws := JsonWebSignature new
+		key: aKeyString;
+		setProtectedHeader: header.
+	checkSignature ifTrue: [  
+		jws checkSignature: parts  ]. 
+	^ jws payload: (JWTClaimsSet fromJson: parts second base64Decoded) 
diff --git a/source/JSONWebToken-Core.package/JsonWebSignature.class/class/materializeCompact.key..st b/source/JSONWebToken-Core.package/JsonWebSignature.class/class/materializeCompact.key..st
@@ -1,4 +1,4 @@
 materializing
 materializeCompact: aString key: aKeyString
-	^ JWSCompactSerializer new materialize: aString key: aKeyString
+	^ self materializeCompact: aString key: aKeyString checkSignature: true
 
diff --git a/...Token-Core.package/JsonWebSignature.class/class/materializeCompact.key.checkSignature..st b/...Token-Core.package/JsonWebSignature.class/class/materializeCompact.key.checkSignature..st
@@ -0,0 +1,4 @@
+materializing
+materializeCompact: aString key: aKeyString checkSignature: checkSignature
+	^ JWSCompactSerializer new materialize: aString key: aKeyString checkSignature: checkSignature
+
diff --git a/source/JSONWebToken-Core.package/JsonWebSignature.class/instance/algorithm.st b/source/JSONWebToken-Core.package/JsonWebSignature.class/instance/algorithm.st
@@ -0,0 +1,3 @@
+accessing
+algorithm
+	^ self protectedHeader algorithm
diff --git a/source/JSONWebToken-Core.package/JsonWebSignature.class/instance/checkSignature..st b/source/JSONWebToken-Core.package/JsonWebSignature.class/instance/checkSignature..st
@@ -0,0 +1,4 @@
+signature
+checkSignature: parts
+	((self signatureFor: ($. join: { parts first . parts second })) = parts third base64Decoded asByteArray) ifFalse: [
+		Error signal: 'signature does not match' ].