Merge pull request #4 from peter-evans/0.4.0

0.4.0

Author: peter-evans

README.md

@@ -82,14 +82,14 @@ payload_claims = {
 }
 footer_claims = { kid = "MDlCMUIwNzU4RTA2QzZFMDQ4" }
 claim_rules = {
-  IssuedBy = "paragonie.com",
-  IdentifiedBy = "87IFSGFgPNtQNNuw0AtuLttP",
-  ForAudience = "some-audience.com",
-  Subject = "test",
-  NotExpired = true,
-  ValidAt = true,
-  ContainsClaim = "data",
-  myclaim = "required value"
+  claim_1 = { claim = "IssuedBy", value = "paragonie.com" },
+  claim_2 = { claim = "IdentifiedBy", value = "87IFSGFgPNtQNNuw0AtuLttP" },
+  claim_3 = { claim = "ForAudience", value = "some-audience.com" },
+  claim_4 = { claim = "Subject", value = "test" },
+  claim_5 = { claim = "NotExpired", value = "" },
+  claim_6 = { claim = "ValidAt", value = "" },
+  claim_7 = { claim = "ContainsClaim", value = "data" },
+  claim_8 = { claim = "myclaim", value = "required value" }
 }
 
 -- generate symmetric key
@@ -131,14 +131,14 @@ payload_claims = {
 }
 footer_claims = { kid = "MDlCMUIwNzU4RTA2QzZFMDQ4" }
 claim_rules = {
-  IssuedBy = "paragonie.com",
-  IdentifiedBy = "87IFSGFgPNtQNNuw0AtuLttP",
-  ForAudience = "some-audience.com",
-  Subject = "test",
-  NotExpired = true,
-  ValidAt = true,
-  ContainsClaim = "data",
-  myclaim = "required value"
+  claim_1 = { claim = "IssuedBy", value = "paragonie.com" },
+  claim_2 = { claim = "IdentifiedBy", value = "87IFSGFgPNtQNNuw0AtuLttP" },
+  claim_3 = { claim = "ForAudience", value = "some-audience.com" },
+  claim_4 = { claim = "Subject", value = "test" },
+  claim_5 = { claim = "NotExpired", value = "" },
+  claim_6 = { claim = "ValidAt", value = "" },
+  claim_7 = { claim = "ContainsClaim", value = "data" },
+  claim_8 = { claim = "myclaim", value = "required value" }
 }
 
 -- generate key pair

paseto/v2.lua

@@ -1,5 +1,5 @@
 local v2 = {
-  _VERSION     = 'paseto v0.3.0',
+  _VERSION     = 'paseto v0.4.0',
   _DESCRIPTION = 'PASETO (Platform-Agnostic Security Tokens) for Lua',
   _URL         = 'https://github.com/peter-evans/paseto-lua',
   _LICENSE     = [[
@@ -149,14 +149,14 @@ local function validate_claims(payload_claims, claim_rules)
   if type(claim_rules) ~= "table" then
     return false, "Invalid claim rules format"
   end
-  for key, value in pairs(claim_rules) do
-    if registered_claims[key] ~= nil then
-      local valid, err = registered_claims[key](payload_claims, value)
+  for _, rule in pairs(claim_rules) do
+    if registered_claims[rule.claim] ~= nil then
+      local valid, err = registered_claims[rule.claim](payload_claims, rule.value)
       if valid == false then
         return false, err
       end
     else
-      local matches, err = claim_matches_expected_value(payload_claims, key, value)
+      local matches, err = claim_matches_expected_value(payload_claims, rule.claim, rule.value)
       if matches == false then
         return false, err
       end

paseto/v2/core.lua

@@ -1,5 +1,5 @@
 local core = {
-  _VERSION     = 'paseto v0.3.0',
+  _VERSION     = 'paseto v0.4.0',
   _DESCRIPTION = 'PASETO (Platform-Agnostic Security Tokens) for Lua',
   _URL         = 'https://github.com/peter-evans/paseto-lua',
   _LICENSE     = [[

rockspecs/paseto-0.4.0-1.rockspec

@@ -0,0 +1,40 @@
+package = "paseto"
+version = "0.4.0-1"
+description = {
+   summary = "PASETO (Platform-Agnostic Security Tokens) for Lua",
+   detailed = "PASETO (Platform-Agnostic SEcurity TOkens) is a specification and reference implementation for secure stateless tokens.",
+   homepage = "http://github.com/peter-evans/paseto-lua",
+   license = "MIT"
+}
+source = {
+   url = "https://github.com/peter-evans/paseto-lua/archive/0.4.0.tar.gz",
+   dir = "paseto-lua-0.4.0"
+}
+dependencies = {
+   "lua >= 5.1, < 5.4",
+   "basexx >= 0.4.0",
+   "lua-struct >= 0.9.0",
+   "lua-cjson >= 2.1.0",
+   "date >= 2.1.2"
+}
+external_dependencies = {
+   SODIUM = {
+      header = "sodium.h"
+   }
+}
+supported_platforms = {
+   "linux"
+}
+build = {
+   type = "builtin",
+   modules = {
+      ["luasodium"] = {
+         sources   = { "csrc/luasodium.c" },
+         libraries = { "sodium" },
+         incdirs   = { "$(SODIUM_INCDIR)" },
+         libdirs   = { "$(SODIUM_LIBDIR)" }
+      },
+      ["paseto.v2"] = "paseto/v2.lua",
+      ["paseto.v2.core"] = "paseto/v2/core.lua"
+   }
+}