fix(x509.crl) fix metamethods when revoked is empty (#79)

when revoked list is empty

Author: fffonion

lib/resty/openssl/x509/crl.lua

@@ -209,10 +209,11 @@ end
 
 local revoked_mt = stack_lib.mt_of("X509_REVOKED", revoked_decode, _M)
 
+local function nil_iter() return nil end
 local function revoked_iter(self)
   local stack = accessors.get_revoked(self.ctx)
   if stack == nil then
-    return
+    return nil_iter
   end
 
   return revoked_mt.__ipairs({ctx = stack})
@@ -221,12 +222,17 @@ end
 mt.__pairs = revoked_iter
 mt.__ipairs = revoked_iter
 mt.__index = function(self, k)
+  local i = tonumber(k)
+  if not i then
+    return _M[k]
+  end
+
   local stack = accessors.get_revoked(self.ctx)
   if stack == nil then
     return nil
   end
 
-  return revoked_mt.__index({ctx = stack}, k)
+  return revoked_mt.__index({ctx = stack}, i)
 end
 mt.__len = function(self)
   local stack = accessors.get_revoked(self.ctx)

t/fixtures/no_revoked.crl

@@ -0,0 +1,18 @@
+-----BEGIN X509 CRL-----
+MIICyTCBsgIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzEpMCcGA1UE
+ChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElT
+UkcgUm9vdCBYMRcNMjIwNTE4MDAwMDAwWhcNMjMwNDE3MjM1OTU5WqAvMC0wHwYD
+VR0jBBgwFoAUebRZ5nu25eQBc4AIiMgaWPbpm24wCgYDVR0UBAMCAWYwDQYJKoZI
+hvcNAQELBQADggIBAC2us3ieEcU7NTFjPyXEi/5aOID7IlPBK7ugS7IJrasTyEdH
+fAMcuoEGHaLoyLqpIKc7U/KIfqysn6l4Mu32aWFB/Ck5qiVufHXFjXIuNo4/drlm
+kPUjhgX0YcMkrWdbLFbF/mi5R7fCTbCP1ihqiw2AKB2jFShTAcybJpVRY7velN/D
+EI8ITJsHnGNOx5XZV7HgO1SbXrba7YGMD0YA+NiXc8VaoDlZdoKh8q/gk8y5vnvL
+UmtsHpdF1zFwDxYdpFLCrV9z8OcPWjguX6bYMWtnN5JPHrlUQrupCIN55ur8ttoq
++9mQ/3Y2OFl1qF6UtHxSDHAI5vA8dBlZxQWSWXKGFPGPssNdB7CUJlZeLWPICWU9
+yANMxG+5ANeXW65GfPexj2DujwDlC46Wdnlvbft+2Bc0SYR72By/1QB3tmgBB//j
+QuJtAIzvRluvdnoIGRHPGVse0Qk4FC2BK04q8HBRw3UbxV1MDYIFCN9hlC625Q1s
+VjrqzGMPAwXYXNa/9hFQkdjKycrdsGvIXZa08sqqx4hY4CpjEeUQoka0XkTUmp7Q
+GDSXFxe4qxQObnU+LAMQ0cEcVb0TNnTC0PCeoSV82n3jRL9QYMe6lvU4pgFMddXz
+jna557uivEENf58Oh0SH5jux5gSlre177jQvvsfn8FeFXsLijw0tCbfupna/
+-----END X509 CRL-----
+

t/openssl/x509/crl.t

@@ -265,10 +265,34 @@ truetrue
 --- no_error_log
 [error]
 
+=== TEST 10: x509.crl doesn't error if revoked is empty (regression)
+--- http_config eval: $::HttpConfig
+--- config
+    location =/t {
+        content_by_lua_block {
+            local f = io.open("t/fixtures/no_revoked.crl"):read("*a")
+            local c = myassert(require("resty.openssl.x509.crl").new(f))
+
+            for k, v in pairs(c) do
+                ngx.say(tostring(k))
+            end
+            -- above should print nothing
+
+            ngx.say(c:get_last_update())
+        }
+    }
+--- request
+    GET /t
+--- response_body_like eval
+"1652832000
+"
+--- no_error_log
+[error]
+
 # START AUTO GENERATED CODE
 
 
-=== TEST 10: x509.crl:get_issuer_name (AUTOGEN)
+=== TEST 11: x509.crl:get_issuer_name (AUTOGEN)
 --- http_config eval: $::HttpConfig
 --- config
     location =/t {
@@ -288,7 +312,7 @@ truetrue
 --- no_error_log
 [error]
 
-=== TEST 11: x509.crl:set_issuer_name (AUTOGEN)
+=== TEST 12: x509.crl:set_issuer_name (AUTOGEN)
 --- http_config eval: $::HttpConfig
 --- config
     location =/t {
@@ -316,7 +340,7 @@ truetrue
 --- no_error_log
 [error]
 
-=== TEST 12: x509.crl:get_last_update (AUTOGEN)
+=== TEST 13: x509.crl:get_last_update (AUTOGEN)
 --- http_config eval: $::HttpConfig
 --- config
     location =/t {
@@ -335,7 +359,7 @@ truetrue
 --- no_error_log
 [error]
 
-=== TEST 13: x509.crl:set_last_update (AUTOGEN)
+=== TEST 14: x509.crl:set_last_update (AUTOGEN)
 --- http_config eval: $::HttpConfig
 --- config
     location =/t {
@@ -361,7 +385,7 @@ truetrue
 --- no_error_log
 [error]
 
-=== TEST 14: x509.crl:get_next_update (AUTOGEN)
+=== TEST 15: x509.crl:get_next_update (AUTOGEN)
 --- http_config eval: $::HttpConfig
 --- config
     location =/t {
@@ -380,7 +404,7 @@ truetrue
 --- no_error_log
 [error]
 
-=== TEST 15: x509.crl:set_next_update (AUTOGEN)
+=== TEST 16: x509.crl:set_next_update (AUTOGEN)
 --- http_config eval: $::HttpConfig
 --- config
     location =/t {
@@ -406,7 +430,7 @@ truetrue
 --- no_error_log
 [error]
 
-=== TEST 16: x509.crl:get_version (AUTOGEN)
+=== TEST 17: x509.crl:get_version (AUTOGEN)
 --- http_config eval: $::HttpConfig
 --- config
     location =/t {
@@ -425,7 +449,7 @@ truetrue
 --- no_error_log
 [error]
 
-=== TEST 17: x509.crl:set_version (AUTOGEN)
+=== TEST 18: x509.crl:set_version (AUTOGEN)
 --- http_config eval: $::HttpConfig
 --- config
     location =/t {
@@ -451,7 +475,7 @@ truetrue
 --- no_error_log
 [error]
 
-=== TEST 19: x509.crl:get_get_signature_name (AUTOGEN)
+=== TEST 20: x509.crl:get_get_signature_name (AUTOGEN)
 --- http_config eval: $::HttpConfig
 --- config
     location =/t {