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 9a94aba1d43d467c7a24a6adf446df7a8ec45444..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
 


@@ -40,6 +39,8 @@ FORM_NODATA  =  0
 FORM_VALID   =  1
 FORM_INVALID = -1
 
 FORM_VALID   =  1
 FORM_INVALID = -1
 

+AUTO = true
+

 CREATE_PREFIX = "cbi.cts."
 REMOVE_PREFIX = "cbi.rts."
 
 CREATE_PREFIX = "cbi.cts."
 REMOVE_PREFIX = "cbi.rts."
 


@@ -77,17 +78,46 @@ 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 = {}
        local clean = {}

-       
+

        for k, v in pairs(deps) do
                k = k:gsub("%$config%.%$section%.", "")
        for k, v in pairs(deps) do
                k = k:gsub("%$config%.%$section%.", "")

-               if k:match("^[%w_]+$") then
+               if k:match("^[%w_]+$") and type(v) == "string" then

                        clean[k] = v
                end
        end
                        clean[k] = v
                end
        end

-       
+

        return clean
 end
 
        return clean
 end
 


@@ -173,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)


@@ -190,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)


@@ -207,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
 


@@ -251,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
 


@@ -310,17 +328,17 @@ function SimpleForm.parse(self, ...)
        if luci.http.formvalue("cbi.submit") then
                Node.parse(self, 1, ...)
        end
        if luci.http.formvalue("cbi.submit") then
                Node.parse(self, 1, ...)
        end

-               
+

        local valid = true
        local valid = true

-       for k, j in ipairs(self.children) do 
+       for k, j in ipairs(self.children) do

                for i, v in ipairs(j.children) do
                for i, v in ipairs(j.children) do

-                       valid = valid 
+                       valid = valid

                         and (not v.tag_missing or not v.tag_missing[1])
                         and (not v.tag_invalid or not v.tag_invalid[1])
                end
        end
                         and (not v.tag_missing or not v.tag_missing[1])
                         and (not v.tag_invalid or not v.tag_invalid[1])
                end
        end

-       
-       local state = 
+
+       local state =

                not luci.http.formvalue("cbi.submit") and 0
                or valid and 1
                or -1
                not luci.http.formvalue("cbi.submit") and 0
                or valid and 1
                or -1


@@ -356,9 +374,9 @@ function SimpleForm.field(self, class, ...)
        if not section then
                section = self:section(SimpleSection)
        end
        if not section then
                section = self:section(SimpleSection)
        end

-       
+

        if instanceof(class, AbstractValue) then
        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


@@ -382,6 +400,11 @@ function SimpleForm.get(self, section, option)
 end
 
 
 end
 
 

+function SimpleForm.get_scheme()
+       return nil
+end
+
+

 
 --[[
 AbstractSection
 
 --[[
 AbstractSection


@@ -395,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


@@ -403,29 +430,29 @@ end
 
 -- Appends a new option
 function AbstractSection.option(self, class, option, ...)
 
 -- Appends a new option
 function AbstractSection.option(self, class, option, ...)

-       -- Autodetect form UVL
-       if not class or type(class) == "boolean"
-        and self.map:get_scheme(self.sectiontype, option) then
+       -- Autodetect from UVL
+       if class == true and self.map:get_scheme(self.sectiontype, option) then

                local vs = self.map:get_scheme(self.sectiontype, option)
                if vs.type == "boolean" then
                local vs = self.map:get_scheme(self.sectiontype, option)
                if vs.type == "boolean" then

-                       class = "Flag"
+                       class = Flag

                elseif vs.type == "list" then
                elseif vs.type == "list" then

-                       class = "DynamicList"
+                       class = DynamicList

                elseif vs.type == "enum" or vs.type == "reference" then
                elseif vs.type == "enum" or vs.type == "reference" then

-                       class = "ListValue"
+                       class = ListValue

                else
                else

-                       class = "Value"
+                       class = Value

                end
        end
                end
        end

-       
+

        if instanceof(class, AbstractValue) then
                local obj  = class(self.map, self, option, ...)
 
                Node._i18n(obj, self.config, self.section or self.sectiontype, option, ...)
 
                self:append(obj)
        if instanceof(class, AbstractValue) then
                local obj  = class(self.map, self, option, ...)
 
                Node._i18n(obj, self.config, self.section or self.sectiontype, option, ...)
 
                self:append(obj)

+               self.fields[option] = obj

                return obj
                return obj

-       elseif not class or type(class) == "boolean" then
+       elseif class == true then

                error("No valid class was given and autodetection failed.")
        else
                error("class must be a descendant of AbstractValue")
                error("No valid class was given and autodetection failed.")
        else
                error("class must be a descendant of AbstractValue")


@@ -502,7 +529,7 @@ end
 -- Creates the section
 function AbstractSection.create(self, section)
        local stat
 -- Creates the section
 function AbstractSection.create(self, section)
        local stat

-       
+

        if section then
                stat = self.map:set(section, nil, self.sectiontype)
        else
        if section then
                stat = self.map:set(section, nil, self.sectiontype)
        else


@@ -540,15 +567,19 @@ function Table.__init__(self, form, data, ...)
        local datasource = {}
        datasource.config = "table"
        self.data = data
        local datasource = {}
        datasource.config = "table"
        self.data = data

-       
+

        function datasource.get(self, section, option)
                return data[section] and data[section][option]
        end
        function datasource.get(self, section, option)
                return data[section] and data[section][option]
        end

-       
+

        function datasource.del(...)
                return true
        end
        function datasource.del(...)
                return true
        end

-       
+
+       function datasource.get_scheme()
+               return nil
+       end
+

        AbstractSection.__init__(self, datasource, "table", ...)
        self.template = "cbi/tblsection"
        self.rowcolors = true
        AbstractSection.__init__(self, datasource, "table", ...)
        self.template = "cbi/tblsection"
        self.rowcolors = true


@@ -565,11 +596,11 @@ end
 
 function Table.cfgsections(self)
        local sections = {}
 
 function Table.cfgsections(self)
        local sections = {}

-       
+

        for i, v in luci.util.kspairs(self.data) do
                table.insert(sections, i)
        end
        for i, v in luci.util.kspairs(self.data) do
                table.insert(sections, i)
        end

-       
+

        return sections
 end
 
        return sections
 end
 


@@ -583,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
 


@@ -604,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


@@ -623,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


@@ -659,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"])


@@ -675,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


@@ -696,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
 


@@ -776,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"


@@ -785,7 +824,7 @@ function AbstractValue.__init__(self, map, section, option, ...)
        self.default   = nil
        self.size      = nil
        self.optional  = false
        self.default   = nil
        self.size      = nil
        self.optional  = false

-       
+

        -- Use defaults from UVL
        if not self.override_scheme
         and self.map:get_scheme(self.section.sectiontype, self.option) then
        -- Use defaults from UVL
        if not self.override_scheme
         and self.map:get_scheme(self.section.sectiontype, self.option) then


@@ -794,7 +833,7 @@ function AbstractValue.__init__(self, map, section, option, ...)
                self.cast        = (vs.type == "list") and "list" or "string"
                self.title       = self.title or vs.title
                self.description = self.description or vs.descr
                self.cast        = (vs.type == "list") and "list" or "string"
                self.title       = self.title or vs.title
                self.description = self.description or vs.descr

-               
+

                if vs.depends and not self.override_dependencies then
                        for i, deps in ipairs(vs.depends) do
                                deps = _uvl_strip_remote_dependencies(deps)
                if vs.depends and not self.override_dependencies then
                        for i, deps in ipairs(vs.depends) do
                                deps = _uvl_strip_remote_dependencies(deps)


@@ -803,12 +842,6 @@ function AbstractValue.__init__(self, map, section, option, ...)
                                end
                        end
                end
                                end
                        end
                end

-               
-               if self.value and vs.values and not self.override_values then
-                       for k, v in pairs(vs.values) do
-                               self:value(k, v)
-                       end
-               end

        end
 end
 
        end
 end
 


@@ -821,7 +854,7 @@ function AbstractValue.depends(self, field, value)
        else
                deps = field
        end
        else
                deps = field
        end

-       
+

        table.insert(self.deps, {deps=deps, add=""})
 end
 
        table.insert(self.deps, {deps=deps, add=""})
 end
 


@@ -1012,18 +1045,42 @@ ListValue = class(AbstractValue)
 function ListValue.__init__(self, ...)
        AbstractValue.__init__(self, ...)
        self.template  = "cbi/lvalue"
 function ListValue.__init__(self, ...)
        AbstractValue.__init__(self, ...)
        self.template  = "cbi/lvalue"

+

        self.keylist = {}
        self.vallist = {}
        self.keylist = {}
        self.vallist = {}

-

        self.size   = 1
        self.widget = "select"
        self.size   = 1
        self.widget = "select"

+
+       if not self.override_scheme
+        and self.map:get_scheme(self.section.sectiontype, self.option) then
+               local vs = self.map:get_scheme(self.section.sectiontype, self.option)
+               if self.value and vs.values and not self.override_values then
+                       if self.rmempty or self.optional then
+                               self:value("")
+                       end
+                       for k, v in pairs(vs.values) do
+                               local deps = {}
+                               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
+       end

 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))

-       
+

        for i, deps in ipairs({...}) do
                table.insert(self.deps, {add = "-"..key, deps=deps})
        end
        for i, deps in ipairs({...}) do
                table.insert(self.deps, {add = "-"..key, deps=deps})
        end


@@ -1049,6 +1106,7 @@ MultiValue = class(AbstractValue)
 function MultiValue.__init__(self, ...)
        AbstractValue.__init__(self, ...)
        self.template = "cbi/mvalue"
 function MultiValue.__init__(self, ...)
        AbstractValue.__init__(self, ...)
        self.template = "cbi/mvalue"

+

        self.keylist = {}
        self.vallist = {}
 
        self.keylist = {}
        self.vallist = {}
 


@@ -1065,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))


@@ -1101,6 +1163,16 @@ function StaticList.__init__(self, ...)
        MultiValue.__init__(self, ...)
        self.cast = "table"
        self.valuelist = self.cfgvalue
        MultiValue.__init__(self, ...)
        self.cast = "table"
        self.valuelist = self.cfgvalue

+
+       if not self.override_scheme
+        and self.map:get_scheme(self.section.sectiontype, self.option) then
+               local vs = self.map:get_scheme(self.section.sectiontype, self.option)
+               if self.value and vs.values and not self.override_values then
+                       for k, v in pairs(vs.values) do
+                               self:value(k, v)
+                       end
+               end
+       end

 end
 
 function StaticList.validate(self, value)
 end
 
 function StaticList.validate(self, value)


@@ -1122,7 +1194,6 @@ function DynamicList.__init__(self, ...)
        AbstractValue.__init__(self, ...)
        self.template  = "cbi/dynlist"
        self.cast = "table"
        AbstractValue.__init__(self, ...)
        self.template  = "cbi/dynlist"
        self.cast = "table"

-       

        self.keylist = {}
        self.vallist = {}
 end
        self.keylist = {}
        self.vallist = {}
 end


@@ -1135,7 +1206,7 @@ end
 
 function DynamicList.validate(self, value, section)
        value = (type(value) == "table") and value or {value}
 
 function DynamicList.validate(self, value, section)
        value = (type(value) == "table") and value or {value}

-       
+

        local valid = {}
        for i, v in ipairs(value) do
                if v and #v > 0 and
        local valid = {}
        for i, v in ipairs(value) do
                if v and #v > 0 and


@@ -1143,7 +1214,7 @@ function DynamicList.validate(self, value, section)
                        table.insert(valid, v)
                end
        end
                        table.insert(valid, v)
                end
        end

-       
+

        return valid
 end
 
        return valid
 end
 


@@ -1169,4 +1240,4 @@ function Button.__init__(self, ...)
        self.template  = "cbi/button"
        self.inputstyle = nil
        self.rmempty = true
        self.template  = "cbi/button"
        self.inputstyle = nil
        self.rmempty = true

-end
\ No newline at end of file
+end