11:16 p.m.
This patch series refactors LACE's simple match code and adds prefix and suffix
to the available matches. Then finally we add PCRE support.
The PCRE support adds a dependency on lrexlib which can be found in the
lua-rex-pcre or liblua5.1-rex-pcre0 packages depending on your OS.
Daniel Silverstone (4):
LACE: Alter simple match compiler ready for more
LACE: Update simple match with generic matchers
LACE: Add prefix and suffix simple matches
LACE: Add PCRE support to simple matcher
lib/gitano/lace.lua | 90 ++++++++++++++++++++----------
skel/gitano-admin/rules/adminchecks.lace | 4 +-
skel/gitano-admin/rules/createrepo.lace | 2 +-
skel/gitano-admin/rules/defines.lace | 2 +-
4 files changed, 65 insertions(+), 33 deletions(-)
--
1.7.10.4
11:16 p.m.
New subject: [PATCH 1/4] LACE: Alter simple match compiler ready for more
This alters the simple match compiler to support a definition format along the
lines of:
define some_name ref pattern ^refs/heads/
The accepted middle entries being exact, pattern, !exact and !pattern
---
lib/gitano/lace.lua | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/lib/gitano/lace.lua b/lib/gitano/lace.lua
index 517c476..4927e1c 100644
--- a/lib/gitano/lace.lua
+++ b/lib/gitano/lace.lua
@@ -46,16 +46,13 @@ end
local matchers = {}
-local function _do_simple_match(ctx, key, value)
+local function _do_simple_match(ctx, key, matchtype, value)
value = util.process_expansion(ctx, value)
- local sigil, value = value:match("^(.)(.*)$")
- local inv = false
- if sigil == "!" then
- inv = true
- elseif sigil ~= "=" then
- value = sigil .. value
+ local inv = matchtype:sub(1,1) == "!"
+ if inv then
+ matchtype = matchtype:sub(2)
end
- local pat = value:match("^%~(.+)$")
+ local pat = (matchtype == "pattern") and value
local kk = ctx[key] or ""
local function check(v)
if pat then
@@ -94,13 +91,32 @@ local function _do_simple_match(ctx, key, value)
end
end
-local function _simple_match(ctx, key, value, guard)
+local function _simple_match(ctx, key, matchtype, value, guard)
if guard ~= nil then
- return lace.compiler.error("Unexpected additional argument", {3})
+ return lace.compiler.error("Unexpected additional argument", {4})
+ end
+ if value == nil then
+ matchtype, value = "", matchtype
+ local sigil, _value = value:match("^(.)(.*)$")
+ if sigil == "!" then
+ inv = true
+ matchtype = "!"
+ value = _value
+ end
+ sigil, _value = value:match("^(.)(.*)$")
+ if sigil == "=" then
+ matchtype = matchtype .. "exact"
+ value = _value
+ elseif sigil == "~" then
+ matchtype = matchtype .. "pattern"
+ value = _value
+ else
+ matchtype = matchtype .. "exact"
+ end
end
return {
fn = _do_simple_match,
- args = { key, util.prep_expansion(value) }
+ args = { key, matchtype, util.prep_expansion(value) }
}
end
--
1.7.10.4
11:16 p.m.
New subject: [PATCH 2/4] LACE: Update simple match with generic matchers
This updates the simple match routine to have a table of match functions.
Initially this only supports the exact and pattern matches, but we can add
more.
---
lib/gitano/lace.lua | 49 +++++++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 22 deletions(-)
diff --git a/lib/gitano/lace.lua b/lib/gitano/lace.lua
index 4927e1c..926d49e 100644
--- a/lib/gitano/lace.lua
+++ b/lib/gitano/lace.lua
@@ -44,46 +44,46 @@ local function _loader(ctx, _name)
return real_name, tree[blob_name].obj.content
end
-local matchers = {}
+local match_types = {
+ exact = function(want, have)
+ return want == have
+ end,
+ pattern = function(want, have)
+ return (have:match(want) ~= nil)
+ end
+}
+
+do
+ local inverted_matches = {}
+ for k, v in pairs(match_types) do
+ inverted_matches["!" .. k] = function(...) return not v(...) end
+ end
+ for k, v in pairs(inverted_matches) do
+ match_types[k] = v
+ end
+end
local function _do_simple_match(ctx, key, matchtype, value)
value = util.process_expansion(ctx, value)
- local inv = matchtype:sub(1,1) == "!"
- if inv then
- matchtype = matchtype:sub(2)
- end
- local pat = (matchtype == "pattern") and value
local kk = ctx[key] or ""
- local function check(v)
- if pat then
- if inv then
- return (v:match(pat) == nil)
- else
- return (v:match(pat) ~= nil)
- end
- end
- if inv then
- return v ~= value
- end
- return v == value
- end
+ local check = match_types[matchtype]
if type(kk) == "function" then
-- Realise the value first
ctx[key] = kk(ctx)
kk = ctx[key]
end
if type(kk) == "string" then
- return check(kk)
+ return check(value, kk)
else
if pat and kk[1] ~= nil then
for i = 1, #kk do
- if check(kk[i]) then
+ if check(value, kk[i]) then
return true
end
end
return false
else
- if inv then
+ if matchtype:sub(1,1) == "!" then
return kk[value] == nil
end
return kk[value] ~= nil
@@ -114,6 +114,9 @@ local function _simple_match(ctx, key, matchtype, value, guard)
matchtype = matchtype .. "exact"
end
end
+ if match_types[matchtype] == nil then
+ return lace.compiler.error("Unknown match type", {2})
+ end
return {
fn = _do_simple_match,
args = { key, matchtype, util.prep_expansion(value) }
@@ -138,6 +141,8 @@ local simples = {
"member/prefix", "member/suffix",
}
+local matchers = {}
+
for _, s in ipairs(simples) do
matchers[s] = _simple_match
end
--
1.7.10.4
11:16 p.m.
New subject: [PATCH 3/4] LACE: Add prefix and suffix simple matches
This adds prefix and suffix simple matches and updates the default ruleset to
use them as appropriate. This actually eliminates almost all pattern matches
from the default ruleset.
---
lib/gitano/lace.lua | 6 ++++++
skel/gitano-admin/rules/adminchecks.lace | 4 ++--
skel/gitano-admin/rules/createrepo.lace | 2 +-
skel/gitano-admin/rules/defines.lace | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/gitano/lace.lua b/lib/gitano/lace.lua
index 926d49e..7fc1be5 100644
--- a/lib/gitano/lace.lua
+++ b/lib/gitano/lace.lua
@@ -48,6 +48,12 @@ local match_types = {
exact = function(want, have)
return want == have
end,
+ prefix = function(want, have)
+ return have:sub(1, #want) == want
+ end,
+ suffix = function(want, have)
+ return have:sub(-#want) == want
+ end,
pattern = function(want, have)
return (have:match(want) ~= nil)
end
diff --git a/skel/gitano-admin/rules/adminchecks.lace
b/skel/gitano-admin/rules/adminchecks.lace
index 75ca753..41bb170 100644
--- a/skel/gitano-admin/rules/adminchecks.lace
+++ b/skel/gitano-admin/rules/adminchecks.lace
@@ -9,8 +9,8 @@ deny "Non-administrators may not delete the admin ref"
op_deleteref
# By default, you don't want anything but gitano-admin members to touch
# anything in the hooks/ tree, so don't allow that
-define contains_hooks target_tree ~^hooks/
-define updates_hooks treediff/targets ~^hooks/
+define contains_hooks target_tree prefix hooks/
+define updates_hooks treediff/targets prefix hooks/
deny "Attempt to create hooks" op_createref contains_hooks
deny "Attempt to alter hooks" op_is_update updates_hooks
diff --git a/skel/gitano-admin/rules/createrepo.lace
b/skel/gitano-admin/rules/createrepo.lace
index 9085706..6807726 100644
--- a/skel/gitano-admin/rules/createrepo.lace
+++ b/skel/gitano-admin/rules/createrepo.lace
@@ -5,7 +5,7 @@
# Uncomment the following to allow repositories in personal/username/
-# define repo_is_personal repository ~^personal/${user}/
+# define repo_is_personal repository prefix personal/${user}/
# allow "Personal repo creation is okay" repo_is_personal
# Otherwise the default is that non-admins can't create repositories
diff --git a/skel/gitano-admin/rules/defines.lace b/skel/gitano-admin/rules/defines.lace
index f920948..0d7882a 100644
--- a/skel/gitano-admin/rules/defines.lace
+++ b/skel/gitano-admin/rules/defines.lace
@@ -68,5 +68,5 @@ define op_is_normal anyof op_fastforward op_createref op_deleteref
# Administration
define is_admin_repo repository gitano-admin
-define is_gitano_ref ref ~^refs/gitano/
+define is_gitano_ref ref prefix refs/gitano/
define is_admin_ref ref refs/gitano/admin
--
1.7.10.4
11:16 p.m.
New subject: [PATCH 4/4] LACE: Add PCRE support to simple matcher
This adds PCRE support to the simple matcher. In order for this to work,
lrexlib is required (lua-rex-pcre in Debian/Ubuntu).
---
lib/gitano/lace.lua | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/gitano/lace.lua b/lib/gitano/lace.lua
index 7fc1be5..97ed91b 100644
--- a/lib/gitano/lace.lua
+++ b/lib/gitano/lace.lua
@@ -9,6 +9,8 @@ local util = require 'gitano.util'
local gall = require 'gall'
local log = require 'gitano.log'
+local pcre = require "rex_pcre"
+
local function _loader(ctx, _name)
local global_name = _name:match("^global:(.+)$")
local name, tree, sha = global_name or _name
@@ -56,7 +58,10 @@ local match_types = {
end,
pattern = function(want, have)
return (have:match(want) ~= nil)
- end
+ end,
+ pcre = function(want, have)
+ return (pcre.match(have, want) ~= nil)
+ end
}
do
--
1.7.10.4
11:30 p.m.
New subject: [PATCH 4/4] LACE: Add PCRE support to simple matcher
On Thu, May 23, 2013 at 10:16:25PM +0100, Daniel Silverstone wrote:
<snip>
- end
+ end,
+ pcre = function(want, have)
+ return (pcre.match(have, want) ~= nil)
+ end
}
It looks pretty easy to make this fail more gracefully if lace encounters
a pcre match when the module is not installed, though it's probably not
worth even that to support a non-standard setup.
I do like that it will not break an existing setup if it's updated without
installing the pcre module. It may be worth providing a warning somewhere
if the library is missing. Possibly when gitano-admin runs commands.
11:32 p.m.
New subject: [PATCH 4/4] LACE: Add PCRE support to simple matcher
On Thu, May 23, 2013 at 10:30:31PM +0100, Richard Maw wrote:
It looks pretty easy to make this fail more gracefully if lace
encounters
a pcre match when the module is not installed, though it's probably not
worth even that to support a non-standard setup.
I do like that it will not break an existing setup if it's updated without
installing the pcre module. It may be worth providing a warning somewhere
if the library is missing. Possibly when gitano-admin runs commands.
It will fail in a horrific heap if the pcre library is not installed.
Just like it would if luxio, lace, supple, gall, clod etc were not installed.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
11:36 p.m.
New subject: [PATCH 4/4] LACE: Add PCRE support to simple matcher
On Thu, May 23, 2013 at 10:32:45PM +0100, Daniel Silverstone wrote:
It will fail in a horrific heap if the pcre library is not
installed.
Just like it would if luxio, lace, supple, gall, clod etc were not installed.
My mistake, I'm thinking of module semantics for some other language, though
I can't remember off the top of my head which one.
11:44 p.m.
On Thu, May 23, 2013 at 10:16:21PM +0100, Daniel Silverstone wrote:
[snip]
Richard confirmed out of band that he's now happy for this to be merged.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
3851
days inactive
3851
days old
8 comments
2 participants
participants (2)
-
Daniel Silverstone -
Richard Maw