[117] Allow JWK parameters of type [String] #120

ghost · 2018-10-24T20:00:57Z

Resolves #117.

Implemented this today throughout the day. Submitting the pull request now, so I can continue implementing feedback tomorrow at work.

Allows encoding and decoding of [String] JWK parameters in addition to String parameters.

Tell me what you think!

⚠️ This contains two API changes in JWS.swift (major release needed):

subscript(parameter: String) -> String?
// becomes
subscript(parameter: String) -> Any?

let parameters: [String: String]
// becomes
let parameters: [String: JWKParameterType]

ghost

These seem like pretty slick changes overall, nice work!

ghost · 2018-12-19T13:35:27Z

JOSESwift/Sources/JWK.swift


    /// Accesses the specified parameter.
    /// The parameters of the JWK representing the properties of the key(s), including the value(s).
    /// Check [RFC 7517, Section 4](https://tools.ietf.org/html/rfc7517#section-4) and
    /// [RFC 7518, Section 6](https://tools.ietf.org/html/rfc7518#section-6) for possible parameters.
    ///
    /// - Parameter parameter: The desired parameter.
-    subscript(parameter: String) -> String? { get }
+    subscript(parameter: String) -> Any? { get }


Why use Any? here instead of JWKParameterType?? Are there non [String]? or String? return types?

I think you're right! I'll need to investigate what I did exactly back then but yeah I think you're right. Will update.

The whole parameter stuff in JWK and in the JOSE header is not exactly nice. We'd love to update all of that some time. 🙏

Jose-ElRobot · 2019-05-27T07:40:00Z

Tests/JWKRSAParameterTypeTests.swift

+        let certificateChain = key.X509CertificateChain
+
+        XCTAssertNotNil(certificateChain)
+        XCTAssertEqual(certificateChain!.count, 1)


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKRSAParameterTypeTests.swift:87

Jose-ElRobot · 2019-05-27T07:40:01Z

Tests/JWKRSAParameterTypeTests.swift

+
+        XCTAssertNotNil(certificateChain)
+        XCTAssertEqual(certificateChain!.count, 1)
+        XCTAssertEqual(certificateChain![0].prefix(5), "MIIDQ")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKRSAParameterTypeTests.swift:88

Jose-ElRobot · 2019-05-27T07:40:02Z

Tests/JWKRSAParameterTypeTests.swift

+        XCTAssertNotNil(certificateChain)
+        XCTAssertEqual(certificateChain!.count, 1)
+        XCTAssertEqual(certificateChain![0].prefix(5), "MIIDQ")
+        XCTAssertEqual(certificateChain![0].suffix(5), "OWA==")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKRSAParameterTypeTests.swift:89

Jose-ElRobot · 2019-05-27T07:40:03Z

Tests/JWKSymmetricParameterTypeTests.swift

+        swb4ECNIKG0CETTUxmXl9KUL+9gGlqCz5iWLOgWsnrcKcY0vXPG9J1r9AqBNTqNgHq2G03X09266X5CpOe1zFo+Owb1zxtp3PehFdfQJ610CDLE\
+        aS9V9Rqp17hCyybEpOGVwe8fnk+fbEL2Bo3UPGrpsHzUoaGpDftmWssZkhpBJKVMJyf/RuP2SmmaIzmnw9JiSlYhzo4tpzd5rFXhjRbg4zW9C+2\
+        qok+2+qDM1iJ684gPHMIY8aLWrdgQTxkumGmTqgawR+N5MDtdPTEQ0XfIBc2cJEUyMTY5MPvACWpkA6SdS4xSvdXK3IVfOWA=="]}
+        """.data(using: .utf8)!


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:26

Jose-ElRobot · 2019-05-27T07:40:05Z

Tests/JWKSymmetricParameterTypeTests.swift

+        let keyOperations = key["key_ops"] as? [String]
+
+        XCTAssertNotNil(keyOperations)
+        XCTAssertEqual(keyOperations!.count, 7)


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:48

Jose-ElRobot · 2019-05-27T07:40:06Z

Tests/JWKSymmetricParameterTypeTests.swift

+
+        XCTAssertNotNil(keyOperations)
+        XCTAssertEqual(keyOperations!.count, 7)
+        XCTAssertEqual(keyOperations![0], "sign")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:49

Jose-ElRobot · 2019-05-27T07:40:08Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertNotNil(keyOperations)
+        XCTAssertEqual(keyOperations!.count, 7)
+        XCTAssertEqual(keyOperations![0], "sign")
+        XCTAssertEqual(keyOperations![1], "encrypt")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:50

Jose-ElRobot · 2019-05-27T07:40:09Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations!.count, 7)
+        XCTAssertEqual(keyOperations![0], "sign")
+        XCTAssertEqual(keyOperations![1], "encrypt")
+        XCTAssertEqual(keyOperations![2], "decrypt")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:51

Jose-ElRobot · 2019-05-27T07:40:10Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations![0], "sign")
+        XCTAssertEqual(keyOperations![1], "encrypt")
+        XCTAssertEqual(keyOperations![2], "decrypt")
+        XCTAssertEqual(keyOperations![3], "wrapKey")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:52

Jose-ElRobot · 2019-05-27T07:40:11Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations![1], "encrypt")
+        XCTAssertEqual(keyOperations![2], "decrypt")
+        XCTAssertEqual(keyOperations![3], "wrapKey")
+        XCTAssertEqual(keyOperations![4], "unwrapKey")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:53

Jose-ElRobot · 2019-05-27T07:40:12Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations![2], "decrypt")
+        XCTAssertEqual(keyOperations![3], "wrapKey")
+        XCTAssertEqual(keyOperations![4], "unwrapKey")
+        XCTAssertEqual(keyOperations![5], "deriveKey")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:54

Jose-ElRobot · 2019-05-27T07:40:13Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations![3], "wrapKey")
+        XCTAssertEqual(keyOperations![4], "unwrapKey")
+        XCTAssertEqual(keyOperations![5], "deriveKey")
+        XCTAssertEqual(keyOperations![6], "deriveBits")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:55

Jose-ElRobot · 2019-05-27T07:40:15Z

Tests/JWKSymmetricParameterTypeTests.swift

+        let keyOperations = key.keyOperations
+
+        XCTAssertNotNil(keyOperations)
+        XCTAssertEqual(keyOperations!.count, 7)


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:64

Jose-ElRobot · 2019-05-27T07:40:15Z

Tests/JWKSymmetricParameterTypeTests.swift

+
+        XCTAssertNotNil(keyOperations)
+        XCTAssertEqual(keyOperations!.count, 7)
+        XCTAssertEqual(keyOperations![0], "sign")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:65

Jose-ElRobot · 2019-05-27T07:40:17Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertNotNil(keyOperations)
+        XCTAssertEqual(keyOperations!.count, 7)
+        XCTAssertEqual(keyOperations![0], "sign")
+        XCTAssertEqual(keyOperations![1], "encrypt")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:66

Jose-ElRobot · 2019-05-27T07:40:18Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations!.count, 7)
+        XCTAssertEqual(keyOperations![0], "sign")
+        XCTAssertEqual(keyOperations![1], "encrypt")
+        XCTAssertEqual(keyOperations![2], "decrypt")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:67

Jose-ElRobot · 2019-05-27T07:40:19Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations![0], "sign")
+        XCTAssertEqual(keyOperations![1], "encrypt")
+        XCTAssertEqual(keyOperations![2], "decrypt")
+        XCTAssertEqual(keyOperations![3], "wrapKey")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:68

Jose-ElRobot · 2019-05-27T07:40:20Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations![1], "encrypt")
+        XCTAssertEqual(keyOperations![2], "decrypt")
+        XCTAssertEqual(keyOperations![3], "wrapKey")
+        XCTAssertEqual(keyOperations![4], "unwrapKey")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:69

Jose-ElRobot · 2019-05-27T07:40:21Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations![2], "decrypt")
+        XCTAssertEqual(keyOperations![3], "wrapKey")
+        XCTAssertEqual(keyOperations![4], "unwrapKey")
+        XCTAssertEqual(keyOperations![5], "deriveKey")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:70

Jose-ElRobot · 2019-05-27T07:40:22Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertEqual(keyOperations![3], "wrapKey")
+        XCTAssertEqual(keyOperations![4], "unwrapKey")
+        XCTAssertEqual(keyOperations![5], "deriveKey")
+        XCTAssertEqual(keyOperations![6], "deriveBits")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:71

Jose-ElRobot · 2019-05-27T07:40:23Z

Tests/JWKSymmetricParameterTypeTests.swift

+        let certificateChain = key["x5c"] as? [String]
+
+        XCTAssertNotNil(certificateChain)
+        XCTAssertEqual(certificateChain!.count, 1)


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:80

Jose-ElRobot · 2019-05-27T07:40:24Z

Tests/JWKSymmetricParameterTypeTests.swift

+
+        XCTAssertNotNil(certificateChain)
+        XCTAssertEqual(certificateChain!.count, 1)
+        XCTAssertEqual(certificateChain![0].prefix(5), "MIIDQ")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:81

Jose-ElRobot · 2019-05-27T07:40:25Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertNotNil(certificateChain)
+        XCTAssertEqual(certificateChain!.count, 1)
+        XCTAssertEqual(certificateChain![0].prefix(5), "MIIDQ")
+        XCTAssertEqual(certificateChain![0].suffix(5), "OWA==")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:82

Jose-ElRobot · 2019-05-27T07:40:25Z

Tests/JWKSymmetricParameterTypeTests.swift

+        let certificateChain = key.X509CertificateChain
+
+        XCTAssertNotNil(certificateChain)
+        XCTAssertEqual(certificateChain!.count, 1)


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:91

Jose-ElRobot · 2019-05-27T07:40:26Z

Tests/JWKSymmetricParameterTypeTests.swift

+
+        XCTAssertNotNil(certificateChain)
+        XCTAssertEqual(certificateChain!.count, 1)
+        XCTAssertEqual(certificateChain![0].prefix(5), "MIIDQ")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:92

Jose-ElRobot · 2019-05-27T07:40:28Z

	1 Warning
⚠️	Your pull request seems to introduce linting violations. Some of them may be fixable by running `bundle exec fastlane format_code`.

	1 Message
📖	Any non-trivial changes to code should be reflected in the changelog. Please consider adding a note in the Unreleased section of the CHANGELOG.md.

Generated by 🚫 Danger

Jose-ElRobot · 2019-05-27T07:40:28Z

Tests/JWKSymmetricParameterTypeTests.swift

+        XCTAssertNotNil(certificateChain)
+        XCTAssertEqual(certificateChain!.count, 1)
+        XCTAssertEqual(certificateChain![0].prefix(5), "MIIDQ")
+        XCTAssertEqual(certificateChain![0].suffix(5), "OWA==")


⚠️ Force unwrapping should be avoided.
force_unwrapping JWKSymmetricParameterTypeTests.swift:93

ghost · 2019-08-05T08:30:07Z

@daniel-mohemian what's the status of this PR?

ghost · 2019-08-21T11:48:59Z

@daniel-mohemian what's the status of this PR?

I need to find time to revisit it and check into which major release we put it. I'll close the PR for now as it obviously is stale. Thanks for reminding me about it!

dlggr added 10 commits October 24, 2018 19:47

Implement decoding of String and [String] parameters

722937b

Adapt tests

0478b7c

Add new test case

9d98e85

Remove key type computed property

32c1e11

Update tests

0bcdd26

Fix long lines

daedd4b

Update readme

c27f7fa

Move parameter getter extension

82ca0c2

Add doc comments to param getters

9a6eaa7

Remove old array parameter test

2cf0c6a

ghost requested review from a user, carol-mohemian and mohemian-92817281 and removed request for a user October 25, 2018 08:05

ghost self-assigned this Oct 25, 2018

ghost requested review from a team and removed request for a user October 25, 2018 08:05

Merge branch 'master' into feature/string-array-jwk-parameters

3e7ea46

ghost requested review from a user and removed request for mohemian-92817281 November 28, 2018 13:08

Merge branch 'master' into feature/string-array-jwk-parameters

2d75cc2

ghost previously approved these changes Dec 19, 2018

View reviewed changes

ghost added the WIP label Jan 22, 2019

ghost mentioned this pull request Jan 22, 2019

Improve EC implementation #137

Merged

daniel-moh added 2 commits January 22, 2019 13:16

Use Codable for JWKPArameterType

bf2539b

Use JWKPArameterType instsead of Any for subscript

763c67f

ghost dismissed their stale review via 763c67f January 22, 2019 12:18

daniel-moh added 2 commits January 22, 2019 13:30

Merge branch 'master' into feature/string-array-jwk-parameters

5ad7f1a

Adapt EC keys for String arary parameters

f006882

Jose-ElRobot reviewed May 27, 2019

View reviewed changes

ghost closed this Aug 21, 2019

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[117] Allow JWK parameters of type [String] #120

[117] Allow JWK parameters of type [String] #120

ghost commented Oct 24, 2018

ghost left a comment

ghost Dec 19, 2018

ghost Jan 8, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot May 27, 2019

Jose-ElRobot commented May 27, 2019

Jose-ElRobot May 27, 2019

ghost commented Aug 5, 2019

ghost commented Aug 21, 2019

[117] Allow JWK parameters of type [String] #120

[117] Allow JWK parameters of type [String] #120

Conversation

ghost commented Oct 24, 2018

ghost left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jose-ElRobot commented May 27, 2019

Choose a reason for hiding this comment

ghost commented Aug 5, 2019

ghost commented Aug 21, 2019