[Refactor] plugins tables and DAOs

database/migrations/cassandra/2015-01-12-175310_init_schema.lua

@@ -101,14 +101,26 @@ local Migration = {
       -- TEMPORARY UNTIL MOVED TO EACH PLUGIN
       -- keyauth_credentials, metrics
       --
+
+      -- username is what the plugin will query this table with. We shouldn't need a consumer_id yet on it
+      -- and then compare the password with the one received by a request
+      CREATE TABLE IF NOT EXISTS basicauth_credentials(
+        consumer_id uuid,
+        username text,
+        password text,
+        created_at timestamp,
+        PRIMARY KEY (username, consumer_id)
+      );
+
+      -- key is what the plugin will query this table with. We shouldn't need a consumer_id yet on it
       CREATE TABLE IF NOT EXISTS keyauth_credentials(
         consumer_id uuid,
         key text,
         created_at timestamp,
         PRIMARY KEY (key, consumer_id)
       );
 
-      CREATE TABLE IF NOT EXISTS metrics(
+      CREATE TABLE IF NOT EXISTS ratelimiting_metrics(
         api_id uuid,
         identifier text,
         period text,
@@ -141,19 +153,6 @@ local Migration = {
       );
       CREATE INDEX IF NOT EXISTS ON applications(consumer_id);
       CREATE INDEX IF NOT EXISTS ON applications(public_key);
-
-
-
-
-
-
-
-
-
-
-
-
-
     ]]
   end,
 

kong-0.1.0beta-2.rockspec

@@ -31,85 +31,83 @@ dependencies = {
 build = {
   type = "builtin",
   modules = {
-    ["kong"] = "src/kong.lua",
-
-    ["classic"] = "src/vendor/classic.lua",
-    ["lapp"] = "src/vendor/lapp.lua",
-
-    ["kong.constants"] = "src/constants.lua",
-
-    ["kong.cli.utils"] = "src/cli/utils/utils.lua",
-    ["kong.cli.utils.start"] = "src/cli/utils/start.lua",
-    ["kong.cli.utils.stop"] = "src/cli/utils/stop.lua",
-    ["kong.cli.db"] = "src/cli/db.lua",
-    ["kong.cli.config"] = "src/cli/config.lua",
-    ["kong.cli.stop"] = "src/cli/stop.lua",
-    ["kong.cli.start"] = "src/cli/start.lua",
-    ["kong.cli.restart"] = "src/cli/restart.lua",
-    ["kong.cli.version"] = "src/cli/version.lua",
-
-    ["kong.tools.utils"] = "src/tools/utils.lua",
-    ["kong.tools.io"] = "src/tools/io.lua",
-    ["kong.tools.migrations"] = "src/tools/migrations.lua",
-    ["kong.tools.faker"] = "src/tools/faker.lua",
-    ["kong.tools.cache"] = "src/tools/cache.lua",
-    ["kong.tools.timestamp"] = "src/tools/timestamp.lua",
-    ["kong.tools.http_client"] = "src/tools/http_client.lua",
-
-    ["kong.resolver.handler"] = "src/resolver/handler.lua",
-    ["kong.resolver.access"] = "src/resolver/access.lua",
-    ["kong.resolver.header_filter"] = "src/resolver/header_filter.lua",
-
-    ["kong.dao.error"] = "src/dao/error.lua",
-    ["kong.dao.schemas"] = "src/dao/schemas.lua",
-    ["kong.dao.cassandra.factory"] = "src/dao/cassandra/factory.lua",
-    ["kong.dao.cassandra.base_dao"] = "src/dao/cassandra/base_dao.lua",
-    ["kong.dao.cassandra.apis"] = "src/dao/cassandra/apis.lua",
-    ["kong.dao.cassandra.metrics"] = "src/dao/cassandra/metrics.lua",
-    ["kong.dao.cassandra.plugins"] = "src/dao/cassandra/plugins.lua",
-    ["kong.dao.cassandra.consumers"] = "src/dao/cassandra/consumers.lua",
-    ["kong.dao.cassandra.applications"] = "src/dao/cassandra/applications.lua",
-
-    ["kong.plugins.base_plugin"] = "src/plugins/base_plugin.lua",
-
-    ["kong.plugins.basicauth.handler"] = "src/plugins/basicauth/handler.lua",
-    ["kong.plugins.basicauth.access"] = "src/plugins/basicauth/access.lua",
-    ["kong.plugins.basicauth.schema"] = "src/plugins/basicauth/schema.lua",
-
-    ["kong.plugins.queryauth.handler"] = "src/plugins/queryauth/handler.lua",
-    ["kong.plugins.queryauth.access"] = "src/plugins/queryauth/access.lua",
-    ["kong.plugins.queryauth.schema"] = "src/plugins/queryauth/schema.lua",
-
-    ["kong.plugins.headerauth.handler"] = "src/plugins/headerauth/handler.lua",
-    ["kong.plugins.headerauth.access"] = "src/plugins/headerauth/access.lua",
-    ["kong.plugins.headerauth.schema"] = "src/plugins/headerauth/schema.lua",
-
-    ["kong.plugins.tcplog.handler"] = "src/plugins/tcplog/handler.lua",
-    ["kong.plugins.tcplog.log"] = "src/plugins/tcplog/log.lua",
-    ["kong.plugins.tcplog.schema"] = "src/plugins/tcplog/schema.lua",
-
-    ["kong.plugins.udplog.handler"] = "src/plugins/udplog/handler.lua",
-    ["kong.plugins.udplog.log"] = "src/plugins/udplog/log.lua",
-    ["kong.plugins.udplog.schema"] = "src/plugins/udplog/schema.lua",
-
-    ["kong.plugins.filelog.handler"] = "src/plugins/filelog/handler.lua",
-    ["kong.plugins.filelog.log"] = "src/plugins/filelog/log.lua",
-    ["kong.plugins.filelog.schema"] = "src/plugins/filelog/schema.lua",
-
-    ["kong.plugins.ratelimiting.handler"] = "src/plugins/ratelimiting/handler.lua",
-    ["kong.plugins.ratelimiting.access"] = "src/plugins/ratelimiting/access.lua",
-    ["kong.plugins.ratelimiting.schema"] = "src/plugins/ratelimiting/schema.lua",
-
-    ["kong.web.app"] = "src/web/app.lua",
-    ["kong.web.routes.apis"] = "src/web/routes/apis.lua",
-    ["kong.web.routes.consumers"] = "src/web/routes/consumers.lua",
-    ["kong.web.routes.applications"] = "src/web/routes/applications.lua",
-    ["kong.web.routes.plugins"] = "src/web/routes/plugins.lua",
-    ["kong.web.routes.base_controller"] = "src/web/routes/base_controller.lua"
+    ["kong"] = "kong/kong.lua",
+
+    ["classic"] = "kong/vendor/classic.lua",
+    ["lapp"] = "kong/vendor/lapp.lua",
+
+    ["kong.constants"] = "kong/constants.lua",
+
+    ["kong.cli.utils"] = "kong/cli/utils/utils.lua",
+    ["kong.cli.utils.start"] = "kong/cli/utils/start.lua",
+    ["kong.cli.utils.stop"] = "kong/cli/utils/stop.lua",
+    ["kong.cli.db"] = "kong/cli/db.lua",
+    ["kong.cli.config"] = "kong/cli/config.lua",
+    ["kong.cli.stop"] = "kong/cli/stop.lua",
+    ["kong.cli.start"] = "kong/cli/start.lua",
+    ["kong.cli.restart"] = "kong/cli/restart.lua",
+    ["kong.cli.version"] = "kong/cli/version.lua",
+
+    ["kong.tools.utils"] = "kong/tools/utils.lua",
+    ["kong.tools.io"] = "kong/tools/io.lua",
+    ["kong.tools.migrations"] = "kong/tools/migrations.lua",
+    ["kong.tools.faker"] = "kong/tools/faker.lua",
+    ["kong.tools.cache"] = "kong/tools/cache.lua",
+    ["kong.tools.timestamp"] = "kong/tools/timestamp.lua",
+    ["kong.tools.http_client"] = "kong/tools/http_client.lua",
+
+    ["kong.resolver.handler"] = "kong/resolver/handler.lua",
+    ["kong.resolver.access"] = "kong/resolver/access.lua",
+    ["kong.resolver.header_filter"] = "kong/resolver/header_filter.lua",
+
+    ["kong.dao.error"] = "kong/dao/error.lua",
+    ["kong.dao.schemas"] = "kong/dao/schemas.lua",
+    ["kong.dao.cassandra.factory"] = "kong/dao/cassandra/factory.lua",
+    ["kong.dao.cassandra.base_dao"] = "kong/dao/cassandra/base_dao.lua",
+    ["kong.dao.cassandra.apis"] = "kong/dao/cassandra/apis.lua",
+    ["kong.dao.cassandra.plugins"] = "kong/dao/cassandra/plugins.lua",
+    ["kong.dao.cassandra.consumers"] = "kong/dao/cassandra/consumers.lua",
+    ["kong.dao.cassandra.applications"] = "kong/dao/cassandra/applications.lua",
+
+    ["kong.plugins.base_plugin"] = "kong/plugins/base_plugin.lua",
+
+    ["kong.plugins.basicauth.handler"] = "kong/plugins/basicauth/handler.lua",
+    ["kong.plugins.basicauth.access"] = "kong/plugins/basicauth/access.lua",
+    ["kong.plugins.basicauth.schema"] = "kong/plugins/basicauth/schema.lua",
+    ["kong.plugins.basicauth.dao.cassandra"] = "kong/plugins/basicauth/dao/cassandra.lua",
+
+    ["kong.plugins.keyauth.handler"] = "kong/plugins/keyauth/handler.lua",
+    ["kong.plugins.keyauth.access"] = "kong/plugins/keyauth/access.lua",
+    ["kong.plugins.keyauth.schema"] = "kong/plugins/keyauth/schema.lua",
+    ["kong.plugins.keyauth.dao.cassandra"] = "kong/plugins/keyauth/dao/cassandra.lua",
+
+    ["kong.plugins.tcplog.handler"] = "kong/plugins/tcplog/handler.lua",
+    ["kong.plugins.tcplog.log"] = "kong/plugins/tcplog/log.lua",
+    ["kong.plugins.tcplog.schema"] = "kong/plugins/tcplog/schema.lua",
+
+    ["kong.plugins.udplog.handler"] = "kong/plugins/udplog/handler.lua",
+    ["kong.plugins.udplog.log"] = "kong/plugins/udplog/log.lua",
+    ["kong.plugins.udplog.schema"] = "kong/plugins/udplog/schema.lua",
+
+    ["kong.plugins.filelog.handler"] = "kong/plugins/filelog/handler.lua",
+    ["kong.plugins.filelog.log"] = "kong/plugins/filelog/log.lua",
+    ["kong.plugins.filelog.schema"] = "kong/plugins/filelog/schema.lua",
+
+    ["kong.plugins.ratelimiting.handler"] = "kong/plugins/ratelimiting/handler.lua",
+    ["kong.plugins.ratelimiting.access"] = "kong/plugins/ratelimiting/access.lua",
+    ["kong.plugins.ratelimiting.schema"] = "kong/plugins/ratelimiting/schema.lua",
+    ["kong.plugins.ratelimiting.dao.cassandra"] = "kong/plugins/ratelimiting/dao/cassandra.lua",
+
+    ["kong.web.app"] = "kong/web/app.lua",
+    ["kong.web.routes.apis"] = "kong/web/routes/apis.lua",
+    ["kong.web.routes.consumers"] = "kong/web/routes/consumers.lua",
+    ["kong.web.routes.applications"] = "kong/web/routes/applications.lua",
+    ["kong.web.routes.plugins"] = "kong/web/routes/plugins.lua",
+    ["kong.web.routes.base_controller"] = "kong/web/routes/base_controller.lua"
   },
   install = {
     conf = { "kong.yml" },
     bin = { "bin/kong" }
   },
-  copy_directories = { "src/web/admin/", "src/web/static/", "database/migrations/" }
+  copy_directories = { "kong/web/admin/", "kong/web/static/", "database/migrations/" }
 }

src/dao/cassandra/factory.lua → kong/dao/cassandra/factory.lua

@@ -32,7 +32,7 @@ end
 
 -- Instanciate a Cassandra DAO.
 -- @param properties Cassandra properties
-function CassandraFactory:new(properties)
+function CassandraFactory:new(properties, plugins_available)
   self.type = "cassandra"
   self._properties = properties
 
@@ -41,11 +41,22 @@ function CassandraFactory:new(properties)
   -- And it may cause errors like "host not found" for "localhost"
   self._properties.hosts = normalize_localhost(self._properties.hosts)
 
-  self.apis = Apis(properties)
-  self.metrics = Metrics(properties)
-  self.plugins = Plugins(properties)
-  self.consumers = Consumers(properties)
-  self.applications = Applications(properties)
+  -- TODO: a metatable to this could prepare all statements as soon as an entry is added
+  self.daos = {
+    apis = Apis(properties),
+    plugins = Plugins(properties),
+    consumers = Consumers(properties)
+  }
+
+  for _, plugin_name in ipairs(plugins_available) do
+    local status, res = pcall(require, string.format("kong.plugins.%s.dao.%s", plugin_name, self.type))
+    if not status then
+      print("No DAO for plugin: "..plugin_name..". "..res)
+    else
+      local plugin_dao = res()
+      table.insert(self.daos, plugin_dao(properties))
+    end
+  end
 end
 
 function CassandraFactory:drop()
@@ -84,12 +95,8 @@ end
 -- Prepare all statements of collections
 -- @return error if any
 function CassandraFactory:prepare()
-  for _, collection in ipairs({ self.apis,
-                                self.metrics,
-                                self.plugins,
-                                self.consumers,
-                                self.applications }) do
-    local status, err = pcall(function() prepare_collection(collection) end)
+  for _, dao in pairs(self.daos) do
+    local status, err = pcall(prepare_collection, dao)
     if not status then
       return err
     end

kong/plugins/basicauth/dao/cassandra.lua

@@ -0,0 +1,56 @@
+local constants = require "kong.constants"
+local BaseDao = require "kong.dao.cassandra.base_dao"
+
+local SCHEMA = {
+  username = { type = "string", required = true, queryable = true },
+  password = { type = "string", required = true },
+  consumer_id = { type = constants.DATABASE_TYPES.ID,
+                  required = true,
+                  foreign = true,
+                  immutable = true },
+  created_at = { type = constants.DATABASE_TYPES.TIMESTAMP }
+}
+
+local BasicAuthDAO = BaseDao:extend()
+
+function BasicAuthDAO:new(properties)
+  self._entity = "basicauth_credentials"
+  self._schema = SCHEMA
+  self._queries = {
+    insert = {
+      params = { "username", "password", "consumer_id", "created_at" },
+      query = [[ INSERT INTO basicauth_credentials(username, password, consumer_id, created_at) VALUES(?, ?, ?, ?); ]]
+    },
+    select = {
+      query = [[ SELECT * FROM basicauth_credentials %s; ]]
+    },
+    select_one = {
+      params = { "username" },
+      query = [[ SELECT * FROM basicauth_credentials WHERE username = ?; ]]
+    },
+    update = {
+      params = { "password", "username" },
+      query = [[ UPDATE basicauth_credentials SET password = ? WHERE username = ?; ]]
+    },
+    delete = {
+      params = { "username" },
+      query = [[ DELETE FROM basicauth_credentials WHERE username = ?; ]]
+    },
+    __foreign = {
+      consumer_id = {
+        params = { "consumer_id" },
+        query = [[ SELECT id FROM consumers WHERE id = ?; ]]
+      }
+    },
+    __unique = {
+      self = {
+        params = { "username" },
+        query = [[ SELECT * FROM basicauth_credentials WHERE username = ?; ]]
+      }
+    }
+  }
+
+  BasicAuthDAO.super.new(self, properties)
+end
+
+return BasicAuthDAO