Optimized UVL validation handling

[project/luci.git] / libs / cbi / luasrc / cbi.lua

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 2583ecd070b3eec34b2e088c66a29ff31ae2d63f..6740141acc35c69f9078bdde1e53173a8714336f 100644 (file)
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -29,10 +29,9 @@ module("luci.cbi", package.seeall)
 require("luci.template")
 require("luci.util")
 require("luci.http")
 require("luci.template")
 require("luci.util")
 require("luci.http")

-require("luci.model.uci")

 require("luci.uvl")
 
 require("luci.uvl")
 

-local uci        = luci.model.uci
+local uci        = require("luci.model.uci")

 local class      = luci.util.class
 local instanceof = luci.util.instanceof
 
 local class      = luci.util.class
 local instanceof = luci.util.instanceof
 


@@ -79,8 +78,37 @@ function load(cbimap, ...)
        return maps
 end
 
        return maps
 end
 

+local function _uvl_validate_section(node, name)
+       local co = node.map:get()
+       luci.uvl.STRICT_UNKNOWN_OPTIONS = false
+       local stat, err = node.map.validator:validate_section(node.config, name, co)
+       if err then
+               node.map.save = false
+               if err.code == luci.uvl.errors.ERR_DEPENDENCY then
+                       node.tag_deperror[name] = true
+               else
+                       node.tag_invalid[name] = true
+               end
+               for i, v in ipairs(err.childs) do
+                       if v.option and node.fields[v.option] then
+                               if v.code == luci.uvl.errors.ERR_OPTION then
+                                       local subcode = v.childs and v.childs[1] and v.childs[1].code
+                                       if subcode == luci.uvl.errors.ERR_DEPENDENCY then
+                                               node.fields[v.option].tag_reqerror[name] = true
+                                       elseif subcode == luci.uvl.errors.ERR_OPT_REQUIRED then
+                                               node.fields[v.option].tag_missing[name] = true
+                                               node.tag_deperror[name] = true
+                                       else
+                                               node.fields[v.option].tag_invalid[name] = true
+                                       end
+                               end
+                       end
+               end
+       end
+
+end

 
 

-function _uvl_strip_remote_dependencies(deps)
+local function _uvl_strip_remote_dependencies(deps)

        local clean = {}
 
        for k, v in pairs(deps) do
        local clean = {}
 
        for k, v in pairs(deps) do


@@ -175,12 +203,15 @@ function Map.__init__(self, config, ...)
        self.config = config
        self.parsechain = {self.config}
        self.template = "cbi/map"
        self.config = config
        self.parsechain = {self.config}
        self.template = "cbi/map"

-       if not uci.load_config(self.config) then
+       self.uci = uci.cursor()
+       self.save = true
+       if not self.uci:load(self.config) then

                error("Unable to read UCI data: " .. self.config)
        end
 
        self.validator = luci.uvl.UVL()
        self.scheme = self.validator:get_scheme(self.config)
                error("Unable to read UCI data: " .. self.config)
        end
 
        self.validator = luci.uvl.UVL()
        self.scheme = self.validator:get_scheme(self.config)

+       

 end
 
 function Map.get_scheme(self, sectiontype, option)
 end
 
 function Map.get_scheme(self, sectiontype, option)


@@ -192,15 +223,6 @@ function Map.get_scheme(self, sectiontype, option)
        end
 end
 
        end
 end
 

-function Map.render(self, ...)
-       if self.stateful then
-               uci.load_state(self.config)
-       else
-               uci.load_config(self.config)
-       end
-       Node.render(self, ...)
-end
-

 
 -- Chain foreign config
 function Map.chain(self, config)
 
 -- Chain foreign config
 function Map.chain(self, config)


@@ -209,34 +231,28 @@ end
 
 -- Use optimized UCI writing
 function Map.parse(self, ...)
 
 -- Use optimized UCI writing
 function Map.parse(self, ...)

-       if self.stateful then
-               uci.load_state(self.config)
-       else
-               uci.load_config(self.config)
-       end
-

        Node.parse(self, ...)
 
        Node.parse(self, ...)
 

-       for i, config in ipairs(self.parsechain) do
-               uci.save_config(config)
-       end
-       if luci.http.formvalue("cbi.apply") then
+       if self.save then

                for i, config in ipairs(self.parsechain) do
                for i, config in ipairs(self.parsechain) do

-                       uci.commit(config)
-                       if luci.config.uci_oncommit and luci.config.uci_oncommit[config] then
-                               luci.util.exec(luci.config.uci_oncommit[config])
+                       self.uci:save(config)
+               end
+               if luci.http.formvalue("cbi.apply") then
+                       for i, config in ipairs(self.parsechain) do
+                               self.uci:commit(config)
+                               self.uci:apply(config)
+       
+                               -- Refresh data because commit changes section names
+                               self.uci:load(config)

                        end
                        end

-
-                       -- Refresh data because commit changes section names
-                       uci.load_config(config)
+       
+                       -- Reparse sections
+                       Node.parse(self, ...)
+       
+               end
+               for i, config in ipairs(self.parsechain) do
+                       self.uci:unload(config)

                end
                end

-
-               -- Reparse sections
-               Node.parse(self, ...)
-
-       end
-       for i, config in ipairs(self.parsechain) do
-               uci.unload(config)

        end
 end
 
        end
 end
 


@@ -253,35 +269,35 @@ end
 
 -- UCI add
 function Map.add(self, sectiontype)
 
 -- UCI add
 function Map.add(self, sectiontype)

-       return uci.add(self.config, sectiontype)
+       return self.uci:add(self.config, sectiontype)

 end
 
 -- UCI set
 function Map.set(self, section, option, value)
        if option then
 end
 
 -- UCI set
 function Map.set(self, section, option, value)
        if option then

-               return uci.set(self.config, section, option, value)
+               return self.uci:set(self.config, section, option, value)

        else
        else

-               return uci.set(self.config, section, value)
+               return self.uci:set(self.config, section, value)

        end
 end
 
 -- UCI del
 function Map.del(self, section, option)
        if option then
        end
 end
 
 -- UCI del
 function Map.del(self, section, option)
        if option then

-               return uci.delete(self.config, section, option)
+               return self.uci:delete(self.config, section, option)

        else
        else

-               return uci.delete(self.config, section)
+               return self.uci:delete(self.config, section)

        end
 end
 
 -- UCI get
 function Map.get(self, section, option)
        if not section then
        end
 end
 
 -- UCI get
 function Map.get(self, section, option)
        if not section then

-               return uci.get_all(self.config)
+               return self.uci:get_all(self.config)

        elseif option then
        elseif option then

-               return uci.get(self.config, section, option)
+               return self.uci:get(self.config, section, option)

        else
        else

-               return uci.get_all(self.config, section)
+               return self.uci:get_all(self.config, section)

        end
 end
 
        end
 end
 


@@ -360,7 +376,7 @@ function SimpleForm.field(self, class, ...)
        end
 
        if instanceof(class, AbstractValue) then
        end
 
        if instanceof(class, AbstractValue) then

-               local obj  = class(self, ...)
+               local obj  = class(self, section, ...)

                obj.track_missing = true
                section:append(obj)
                return obj
                obj.track_missing = true
                section:append(obj)
                return obj


@@ -402,6 +418,10 @@ function AbstractSection.__init__(self, map, sectiontype, ...)
        self.config = map.config
        self.optionals = {}
        self.defaults = {}
        self.config = map.config
        self.optionals = {}
        self.defaults = {}

+       self.fields = {}
+       self.tag_error = {}
+       self.tag_invalid = {}
+       self.tag_deperror = {}

 
        self.optional = true
        self.addremove = false
 
        self.optional = true
        self.addremove = false


@@ -430,6 +450,7 @@ function AbstractSection.option(self, class, option, ...)
                Node._i18n(obj, self.config, self.section or self.sectiontype, option, ...)
 
                self:append(obj)
                Node._i18n(obj, self.config, self.section or self.sectiontype, option, ...)
 
                self:append(obj)

+               self.fields[option] = obj

                return obj
        elseif class == true then
                error("No valid class was given and autodetection failed.")
                return obj
        elseif class == true then
                error("No valid class was given and autodetection failed.")


@@ -593,7 +614,7 @@ NamedSection = class(AbstractSection)
 function NamedSection.__init__(self, map, section, stype, ...)
        AbstractSection.__init__(self, map, stype, ...)
        Node._i18n(self, map.config, section, nil, ...)
 function NamedSection.__init__(self, map, section, stype, ...)
        AbstractSection.__init__(self, map, stype, ...)
        Node._i18n(self, map.config, section, nil, ...)

-
+       

        -- Defaults
        self.addremove = false
 
        -- Defaults
        self.addremove = false
 


@@ -614,7 +635,6 @@ function NamedSection.parse(self)
        local s = self.section
        local active = self:cfgvalue(s)
 
        local s = self.section
        local active = self:cfgvalue(s)
 

-

        if self.addremove then
                local path = self.config.."."..s
                if active then -- Remove the section
        if self.addremove then
                local path = self.config.."."..s
                if active then -- Remove the section


@@ -633,6 +653,10 @@ function NamedSection.parse(self)
                AbstractSection.parse_dynamic(self, s)
                if luci.http.formvalue("cbi.submit") then
                        Node.parse(self, s)
                AbstractSection.parse_dynamic(self, s)
                if luci.http.formvalue("cbi.submit") then
                        Node.parse(self, s)

+                       
+                       if not self.override_scheme and self.map.scheme then
+                               _uvl_validate_section(self, s)
+                       end

                end
                AbstractSection.parse_optionals(self, s)
        end
                end
                AbstractSection.parse_optionals(self, s)
        end


@@ -669,7 +693,7 @@ end
 -- Return all matching UCI sections for this TypedSection
 function TypedSection.cfgsections(self)
        local sections = {}
 -- Return all matching UCI sections for this TypedSection
 function TypedSection.cfgsections(self)
        local sections = {}

-       uci.foreach(self.map.config, self.sectiontype,
+       self.map.uci:foreach(self.map.config, self.sectiontype,

                function (section)
                        if self:checkscope(section[".name"]) then
                                table.insert(sections, section[".name"])
                function (section)
                        if self:checkscope(section[".name"]) then
                                table.insert(sections, section[".name"])


@@ -685,6 +709,30 @@ function TypedSection.depends(self, option, value)
 end
 
 function TypedSection.parse(self)
 end
 
 function TypedSection.parse(self)

+       if self.addremove then
+               -- Remove
+               local crval = REMOVE_PREFIX .. self.config
+               local name = luci.http.formvaluetable(crval)
+               for k,v in pairs(name) do
+                       if self:cfgvalue(k) and self:checkscope(k) then
+                               self:remove(k)
+                       end
+               end
+       end
+
+       local co
+       for i, k in ipairs(self:cfgsections()) do
+               AbstractSection.parse_dynamic(self, k)
+               if luci.http.formvalue("cbi.submit") then
+                       Node.parse(self, k)
+                       
+                       if not self.override_scheme and self.map.scheme then
+                               _uvl_validate_section(self, k)
+                       end
+               end
+               AbstractSection.parse_optionals(self, k)
+       end
+

        if self.addremove then
                -- Create
                local crval = CREATE_PREFIX .. self.config .. "." .. self.sectiontype
        if self.addremove then
                -- Create
                local crval = CREATE_PREFIX .. self.config .. "." .. self.sectiontype


@@ -706,31 +754,11 @@ function TypedSection.parse(self)
                                        self.err_invalid = true
                                end
 
                                        self.err_invalid = true
                                end
 

-                               if name and name:len() > 0 then
+                               if name and #name > 0 then

                                        self:create(name)
                                end
                        end
                end
                                        self:create(name)
                                end
                        end
                end

-
-               -- Remove
-               crval = REMOVE_PREFIX .. self.config
-               name = luci.http.formvaluetable(crval)
-               for k,v in pairs(name) do
-                       luci.util.perror(k)
-                       luci.util.perror(self:cfgvalue(k))
-                       luci.util.perror(self:checkscope(k))
-                       if self:cfgvalue(k) and self:checkscope(k) then
-                               self:remove(k)
-                       end
-               end
-       end
-
-       for i, k in ipairs(self:cfgsections()) do
-               AbstractSection.parse_dynamic(self, k)
-               if luci.http.formvalue("cbi.submit") then
-                       Node.parse(self, k)
-               end
-               AbstractSection.parse_optionals(self, k)

        end
 end
 
        end
 end
 


@@ -786,6 +814,7 @@ function AbstractValue.__init__(self, map, section, option, ...)
        self.config  = map.config
        self.tag_invalid = {}
        self.tag_missing = {}
        self.config  = map.config
        self.tag_invalid = {}
        self.tag_missing = {}

+       self.tag_reqerror = {}

        self.tag_error = {}
        self.deps = {}
        self.cast = "string"
        self.tag_error = {}
        self.deps = {}
        self.cast = "string"


@@ -1031,8 +1060,11 @@ function ListValue.__init__(self, ...)
                        end
                        for k, v in pairs(vs.values) do
                                local deps = {}
                        end
                        for k, v in pairs(vs.values) do
                                local deps = {}

-                               if vs.enum_depends and vs.enum_depends[k] then
-                                       deps = _uvl_strip_remote_dependencies(vs.enum_depends[k])
+                               if not self.override_dependencies
+                                and vs.enum_depends and vs.enum_depends[k] then
+                                       for i, dep in ipairs(vs.enum_depends[k]) do
+                                               table.insert(deps, _uvl_strip_remote_dependencies(dep))
+                                       end

                                end
                                self:value(k, v, unpack(deps))
                        end
                                end
                                self:value(k, v, unpack(deps))
                        end


@@ -1041,6 +1073,10 @@ function ListValue.__init__(self, ...)
 end
 
 function ListValue.value(self, key, val, ...)
 end
 
 function ListValue.value(self, key, val, ...)

+       if luci.util.contains(self.keylist, key) then
+               return
+       end
+

        val = val or key
        table.insert(self.keylist, tostring(key))
        table.insert(self.vallist, tostring(val))
        val = val or key
        table.insert(self.keylist, tostring(key))
        table.insert(self.vallist, tostring(val))


@@ -1087,6 +1123,10 @@ function MultiValue.render(self, ...)
 end
 
 function MultiValue.value(self, key, val)
 end
 
 function MultiValue.value(self, key, val)

+       if luci.util.contains(self.keylist, key) then
+               return
+       end
+

        val = val or key
        table.insert(self.keylist, tostring(key))
        table.insert(self.vallist, tostring(val))
        val = val or key
        table.insert(self.keylist, tostring(key))
        table.insert(self.vallist, tostring(val))