Skip to content

added secretBase64Encoded parameter to the decode func. #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

added secretBase64Encoded parameter to the decode func. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Sources/Decode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ public enum InvalidToken : CustomStringConvertible, ErrorType {


/// Decode a JWT
public func decode(jwt:String, algorithms:[Algorithm], verify:Bool = true, audience:String? = nil, issuer:String? = nil) throws -> Payload {
public func decode(jwt:String, algorithms:[Algorithm], verify:Bool = true, audience:String? = nil, issuer:String? = nil, secretBase64Encoded: Bool = false) throws -> Payload {
switch load(jwt) {
case let .Success(header, payload, signature, signatureInput):
if verify {
if let failure = validateClaims(payload, audience: audience, issuer: issuer) ?? verifySignature(algorithms, header: header, signingInput: signatureInput, signature: signature) {
if let failure = validateClaims(payload, audience: audience, issuer: issuer) ?? verifySignature(algorithms, header: header, signingInput: signatureInput, signature: signature, secretBase64Encoded: secretBase64Encoded) {
throw failure
}
}
Expand All @@ -63,8 +63,8 @@ public func decode(jwt:String, algorithms:[Algorithm], verify:Bool = true, audie
}

/// Decode a JWT
public func decode(jwt:String, algorithm:Algorithm, verify:Bool = true, audience:String? = nil, issuer:String? = nil) throws -> Payload {
return try decode(jwt, algorithms: [algorithm], verify: verify, audience: audience, issuer: issuer)
public func decode(jwt:String, algorithm:Algorithm, verify:Bool = true, audience:String? = nil, issuer:String? = nil, secretBase64Encoded: Bool = false) throws -> Payload {
return try decode(jwt, algorithms: [algorithm], verify: verify, audience: audience, issuer: issuer, secretBase64Encoded: secretBase64Encoded)
}

// MARK: Parsing a JWT
Expand Down Expand Up @@ -115,10 +115,10 @@ func load(jwt:String) -> LoadResult {

// MARK: Signature Verification

func verifySignature(algorithms:[Algorithm], header:Payload, signingInput:String, signature:NSData) -> InvalidToken? {
func verifySignature(algorithms:[Algorithm], header:Payload, signingInput:String, signature:NSData, secretBase64Encoded: Bool) -> InvalidToken? {
if let alg = header["alg"] as? String {
let matchingAlgorithms = algorithms.filter { algorithm in algorithm.description == alg }
let results = matchingAlgorithms.map { algorithm in algorithm.verify(signingInput, signature: signature) }
let results = matchingAlgorithms.map { algorithm in algorithm.verify(signingInput, signature: signature, secretBase64Encoded: secretBase64Encoded) }
let successes = results.filter { $0 }
if successes.count > 0 {
return nil
Expand Down
10 changes: 6 additions & 4 deletions Sources/JWT.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ public enum Algorithm : CustomStringConvertible {
}

/// Sign a message using the algorithm
func sign(message:String) -> String {
func sign(message:String, secretBase64Encoded: Bool = false) -> String {
func signHS(key:String, variant:CryptoSwift.HMAC.Variant) -> String {
let keyData = key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
guard let keyData = secretBase64Encoded ? base64decode(key) : key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) else {
return ""
}
let messageData = message.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
let mac = Authenticator.HMAC(key: keyData.arrayOfBytes(), variant:variant)
let result: [UInt8]
Expand Down Expand Up @@ -80,8 +82,8 @@ public enum Algorithm : CustomStringConvertible {
}

/// Verify a signature for a message using the algorithm
func verify(message:String, signature:NSData) -> Bool {
return sign(message) == base64encode(signature)
func verify(message:String, signature:NSData, secretBase64Encoded: Bool) -> Bool {
return sign(message, secretBase64Encoded: secretBase64Encoded) == base64encode(signature)
}
}

Expand Down