package/gluon-web-admin/luasrc/lib/gluon/config-mode/model/admin/remote.lua

@@ -12,8 +12,8 @@ You may obtain a copy of the License at
 
 local util = require 'gluon.util'
 local site = require 'gluon.site'
+local sp = util.subprocess
 
-local fcntl = require 'posix.fcntl'
 local unistd = require 'posix.unistd'
 local wait = require 'posix.sys.wait'
 
@@ -51,7 +51,7 @@ end
 
 local f_password = Form(translate("Password"), translate(
 	"Alternatively, you can set a password to access your node. Please choose a "
-	.. "secure password you don't use anywhere else.<br /><br />If you set an empty "
+	.. "secure password you don't use anywhere else.<br><br>If you set an empty "
 	.. "password, login via password will be disabled. This is the default."
 	), 'password'
 )
@@ -76,29 +76,16 @@ function pw2.cfgvalue()
 end
 
 local function set_password(password)
-	local inr, inw = unistd.pipe()
-	local pid = unistd.fork()
-
-	if pid < 0 then
+	local options = {
+		stdin = sp.PIPE,
+		stdout = sp.DEVNULL,
+		stderr = sp.DEVNULL,
+	}
+	local pid, pipe = sp.popen('passwd', {}, options)
+	if not pid then
 		return false
-	elseif pid == 0 then
-		unistd.close(inw)
-
-		local null = fcntl.open('/dev/null', fcntl.O_WRONLY)
-		unistd.dup2(null, unistd.STDOUT_FILENO)
-		unistd.dup2(null, unistd.STDERR_FILENO)
-		if null > 2 then
-			unistd.close(null)
 	end
-
-		unistd.dup2(inr, unistd.STDIN_FILENO)
-		unistd.close(inr)
-
-		unistd.execp('passwd', {[0] = 'passwd'})
-		os.exit(127)
-	end
-
-	unistd.close(inr)
+	local inw = pipe.stdin
 
 	unistd.write(inw, string.format('%s\n%s\n', password, password))
 	unistd.close(inw)

package/gluon-web-autoupdater/Makefile

@@ -4,8 +4,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-autoupdater
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web-autoupdater/luasrc/lib/gluon/config-mode/model/admin/autoupdater.lua

---[[
-Copyright 2013 Nils Schneider <nils@nilsschneider.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-]]--
+-- SPDX-FileCopyrightText: 2013 Nils Schneider <nils@nilsschneider.net>
+-- SPDX-License-Identifier: Apache-2.0
 
 local uci = require("simple-uci").cursor()
 local autoupdater = uci:get_first("autoupdater", "autoupdater")

package/gluon-web-cellular/Makefile

+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-web-cellular
+
+include ../gluon.mk
+
+define Package/gluon-web-cellular
+  DEPENDS:=+gluon-web-admin
+  TITLE:=UI for activating cellular WAN
+endef
+
+$(eval $(call BuildPackageGluon,gluon-web-cellular))

package/gluon-web-cellular/i18n/de.po

+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2023-01-23 13:33+0100\n"
+"Last-Translator: Tom Herbers <mail@tomherbers.de>\n"
+"Language-Team: German\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "APN"
+msgstr ""
+
+msgid "Cellular"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Aktiviert"
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4/IPv6"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "Password"
+msgstr "Passwort"
+
+msgid "SIM PIN"
+msgstr ""
+
+msgid "Type"
+msgstr "Typ"
+
+msgid "Username"
+msgstr "Nutzername"
+
+msgid ""
+"You can enable uplink via cellular service. If you decide so, the VPN "
+"connection is established using the integrated WWAN modem."
+msgstr ""
+"Du kannst den Uplink über einen Mobilfunk Service aktivieren. Wenn du "
+"dich dafür entscheidest, wird die VPN-Verbindung über das integrierte "
+"Mobilfunk-Modem hergestellt."
+
+msgid "Authentication"
+msgstr "Authentifizierung"
+
+msgid "None"
+msgstr "Keine"
+
+msgid "PAP"
+msgstr ""
+
+msgid "CHAP"
+msgstr ""
+
+msgid "Both"
+msgstr "Beide"

package/gluon-web-cellular/i18n/gluon-web-cellular.pot

+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "APN"
+msgstr ""
+
+msgid "Cellular"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4/IPv6"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "SIM PIN"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid ""
+"You can enable uplink via cellular service. If you decide so, the VPN "
+"connection is established using the integrated WWAN modem."
+msgstr ""
+
+msgid "Authentication"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "PAP"
+msgstr ""
+
+msgid "CHAP"
+msgstr ""
+
+msgid "Both"
+msgstr ""

package/gluon-web-cellular/luasrc/lib/gluon/config-mode/controller/admin/cellular.lua

+local platform = require 'gluon.platform'
+
+package 'gluon-web-cellular'
+
+if platform.is_cellular_device() then
+	entry({"admin", "cellular"}, model("admin/cellular"), _("Cellular"), 30)
+end

package/gluon-web-cellular/luasrc/lib/gluon/config-mode/model/admin/cellular.lua

+local uci = require("simple-uci").cursor()
+
+local f = Form(translate("Cellular"))
+
+local s = f:section(Section, nil, translate(
+	'You can enable uplink via cellular service. If you decide so, the VPN connection is established '
+	.. 'using the integrated WWAN modem.'
+))
+
+local enabled = s:option(Flag, "enabled", translate("Enabled"))
+enabled.default = uci:get('gluon', 'cellular') and uci:get_bool('gluon', 'cellular', 'enabled')
+
+local pin = s:option(Value, "pin", translate("SIM PIN"))
+pin:depends(enabled, true)
+pin.default = uci:get('gluon', 'cellular', 'pin')
+
+local apn = s:option(Value, "apn", translate("APN"))
+apn:depends(enabled, true)
+apn.default = uci:get('gluon', 'cellular', 'apn')
+
+local pdptype = s:option(ListValue, "type", translate("Type"))
+pdptype:depends(enabled, true)
+pdptype:value("IP", translate("IPv4"))
+pdptype:value("IPV6", translate("IPv6"))
+pdptype:value("IPV4V6", translate("IPv4/IPv6"))
+pdptype.default = uci:get('gluon', 'cellular', 'pdptype') or "IP"
+
+local username = s:option(Value, "username", translate("Username"))
+username:depends(enabled, true)
+username.default = uci:get('gluon', 'cellular', 'username')
+
+local password = s:option(Value, "password", translate("Password"))
+password:depends(enabled, true)
+password.default = uci:get('gluon', 'cellular', 'password')
+
+local auth = s:option(ListValue, "auth", translate("Authentication"))
+auth:depends(enabled, true)
+auth:value("none", translate("None"))
+auth:value("pap", translate("PAP"))
+auth:value("chap", translate("CHAP"))
+auth:value("both", translate("Both"))
+auth.default = uci:get('gluon', 'cellular', 'auth') or "none"
+
+function f:write()
+	local cellular_enabled = false
+	if enabled.data then
+		cellular_enabled = true
+	end
+
+	uci:section('gluon', 'cellular', 'cellular', {
+		enabled = cellular_enabled,
+		apn = apn.data,
+		pdptype = pdptype.data,
+		pin = pin.data,
+		username = username.data,
+		password = password.data,
+		auth = auth.data,
+	})
+
+	uci:commit('gluon')
+end
+
+return f

package/gluon-web-logging/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-logging
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web-mesh-vpn-fastd/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-mesh-vpn-fastd
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web-mesh-vpn-fastd/files/lib/gluon/config-mode/view/mesh-vpn-fastd.html

 <div class="gluon-value">
 	<div class="gluon-value-title">
-    <input class="gluon-input-radio" data-update="change" type="radio" value="security"<%= attr("id", id..'.1') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "security") and "checked") %> />
+		<input data-update="change" type="radio" value="security"<%= attr("id", id..'.1') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "security") and "checked") %>>
 		<label<%= attr("for", id..'.1')%>></label>
 	</div>
 	<div class="gluon-value-field-long">
 		<label<%= attr("for", id..'.1') %> class="gluon-value-title"><%:Security mode%></label>
-    <br />
+		<br>
 		<%| translate(
 			'In security mode, the mesh VPN uses an encrypted tunnel to connect to the VPN servers. ' ..
 			'The encryption ensures that it is impossible for your internet access provider to see what ' ..
 			'data is exchanged over your node.'
 		) %>
-    <br />
+		<br>
 	</div>
 	<div class="gluon-value-field-long-after"></div>
 </div>
 
 <div class="gluon-value gluon-value-last">
 	<div class="gluon-value-title">
-    <input class="gluon-input-radio" data-update="change" type="radio" value="performance"<%= attr("id", id..'.2') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "performance") and "checked") %> />
+		<input data-update="change" type="radio" value="performance"<%= attr("id", id..'.2') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "performance") and "checked") %>>
 		<label<%= attr("for", id..'.2')%>></label>
 	</div>
 	<div class="gluon-value-field-long">
 		<label<%= attr("for", id..'.2') %> class="gluon-value-title"><%:Performance mode%></label>
-    <br />
+		<br>
 		<%| translate(
 			'In performance mode, no encryption is used. This usually allows for higher throughput, but the data exchanged over your node is not ' ..
 			'protected against eavesdropping.'
 		) %>
-    <br />
+		<br>
 	</div>
 	<div class="gluon-value-field-long-after"></div>
 </div>

package/gluon-web-mesh-vpn-fastd/luasrc/lib/gluon/config-mode/model/admin/mesh_vpn_fastd.lua

@@ -10,7 +10,7 @@ mode.package = "gluon-web-mesh-vpn-fastd"
 mode.template = "mesh-vpn-fastd"
 
 local methods = uci:get('fastd', 'mesh_vpn', 'method')
-if util.contains(methods, 'null') then
+if util.contains(methods, 'null@l2tp') or util.contains(methods, 'null') then
 	-- performance mode will only be used as default, if it is present in site.mesh_vpn.fastd.methods
 	mode.default = 'performance'
 else
@@ -24,11 +24,12 @@ function mode:write(data)
 	-- if performance mode was selected, and the method 'null' was not present in the original table, it will be added
 	local site_methods = {}
 	if data == 'performance' then
+		table.insert(site_methods, 'null@l2tp')
 		table.insert(site_methods, 'null')
 	end
 
 	for _, method in ipairs(site.mesh_vpn.fastd.methods()) do
-		if method ~= 'null' then
+		if method ~= 'null@l2tp' and method ~= 'null' then
 			table.insert(site_methods, method)
 		end
 	end

package/gluon-web-model/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-model
-PKG_VERSION:=1
 
 include ../gluon.mk
 
@@ -10,4 +9,17 @@ define Package/gluon-web-model
   DEPENDS:=+gluon-web
 endef
 
+PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY
+
+define Package/gluon-web-model/install
+	$(Gluon/Build/Install)
+	$(INSTALL_DIR) $(1)/lib/gluon/web/www/static/
+
+ifdef CONFIG_GLUON_MINIFY
+	$(INSTALL_DATA) ./javascript/gluon-web-model.min.js $(1)/lib/gluon/web/www/static/gluon-web-model.js
+else
+	$(INSTALL_DATA) ./javascript/gluon-web-model.js $(1)/lib/gluon/web/www/static/
+endif
+endef
+
 $(eval $(call BuildPackageGluon,gluon-web-model))

package/gluon-web-model/files/lib/gluon/web/view/model/dynlist.html

@@ -10,11 +10,11 @@
 <%
 	for i, val in ipairs(self:cfgvalue()) do
 %>
-	<input class="gluon-input-text" value="<%|val%>" data-update="change" type="text"<%=
+	<input value="<%|val%>" data-update="change" type="text"<%=
 		attr("id", id .. "." .. i) ..
 		attr("name", id) ..
 		attr("size", self.size) ..
 		attr("placeholder", self.placeholder)
-	%> /><br />
+	%>><br>
 <% end %>
 </div>

package/gluon-web-model/files/lib/gluon/web/view/model/form.html

 <form method="post" enctype="multipart/form-data" action="<%|url(request)%>" data-update="reset">
-	<input type="hidden" name="token" value="<%=token%>" />
-	<input type="hidden" name="<%=id%>" value="1" />
+	<input type="hidden" name="<%=id%>" value="1">
 
 	<div class="gluon-form" id="form-<%=id%>">
 		<% if self.title and #self.title > 0 then %><h2 name="content"><%|self.title%></h2><% end %>
 		<% if self.description and #self.description > 0 then %><div class="gluon-form-descr"><%=self.description%></div><% end %>
-		<% self:render_children(renderer) %>
+		<% self:render_children(renderer, scope) %>
 	</div>
 <%- if self.message then %>
 	<div><%|self.message%></div>
@@ -17,12 +16,12 @@
 	<%- if self.submit ~= false then %>
 		<input class="gluon-button gluon-button-submit" type="submit" value="
 			<%- if not self.submit then -%><%-:Save-%><%-else-%><%|self.submit%><%end-%>
-		" />
+		">
 	<% end %>
 	<%- if self.reset ~= false then %>
 		<input class="gluon-button gluon-button-reset" type="reset" value="
 			<%- if not self.reset then -%><%-:Reset-%><%-else-%><%|self.reset%><%end-%>
-		" />
+		">
 	<% end %>
 	</div>
 </form>

package/gluon-web-model/files/lib/gluon/web/view/model/fvalue.html

-<input class="gluon-input-checkbox" data-update="click change" type="checkbox" value="1"<%=
+<input data-update="click change" type="checkbox" value="1"<%=
 	attr("id", id) .. attr("name", id) ..
 	attr("checked", self:cfgvalue() and "checked")
-%> />
+%>>
 <label<%= attr("for", id)%>></label>

package/gluon-web-model/files/lib/gluon/web/view/model/lvalue.html

 <%
-	local br = self.orientation == "horizontal" and '&#160;&#160;&#160;' or '<br />'
+	local br = self.orientation == "horizontal" and '&#160;&#160;&#160;' or '<br>'
 	local entries = self:entries()
 %>
 
 <% if self.widget == "select" then %>
-	<select class="gluon-input-select" data-update="change"<%=
+	<div class="select-wrapper">
+		<select data-update="change"<%=
 			attr("id", id) ..
 			attr("name", id) ..
 			attr("size", self.size) ..
@@ -21,6 +22,7 @@
 				%>><%|entry.value%></option>
 			<%- end %>
 		</select>
+	</div>
 <% elseif self.widget == "radio" then %>
 	<div>
 		<% for i, entry in pairs(entries) do %>
@@ -28,12 +30,12 @@
 				attr("data-index", i) ..
 				attr("data-depends", self:deplist(entry.deps))
 			%>>
-				<input class="gluon-input-radio" data-update="click change" type="radio"<%=
+				<input data-update="click change" type="radio"<%=
 					attr("id", id.."."..entry.key) ..
 					attr("name", id) ..
 					attr("value", entry.key) ..
 					attr("checked", (self:cfgvalue() == entry.key) and "checked")
-				%> />
+				%>>
 				<label<%= attr("for", id.."."..entry.key)%>></label>
 				<%|entry.value%>
 			</label>

package/gluon-web-model/files/lib/gluon/web/view/model/mlvalue.html

+<%
+	local br = self.orientation == "horizontal" and '&#160;&#160;&#160;' or '<br>'
+	local entries = self:entries()
+	local util = require 'gluon.util'
+%>
+<div>
+	<% for i, entry in pairs(entries) do %>
+		<label<%=
+			attr("data-index", i) ..
+			attr("data-depends", self:deplist(entry.deps))
+		%>>
+			<input data-update="click change" type="checkbox"<%=
+				attr("id", id.."."..entry.key) ..
+				attr("name", id) ..
+				attr("value", entry.key) ..
+				attr("checked", (util.contains(self:cfgvalue(), entry.key)) and "checked") ..
+				attr("data-exclusive-with", self.exclusions[entry.key]) ..
+				attr("data-update", "change")
+			%>>
+			<label<%= attr("for", id.."."..entry.key)%>></label>
+			<span class="gluon-multi-list-option-descr"><%|entry.value%></span>
+		</label>
+		<% if i ~= #entries then write(br) end %>
+	<% end %>
+</div>

package/gluon-web-model/files/lib/gluon/web/view/model/section.html

-<fieldset class="gluon-section">
+<fieldset class="gluon-section" id="<%=id%>" data-index="<%=self.index%>"<%= attr("data-depends", self:deplist()) %>>
 	<% if self.title and #self.title > 0 then -%>
 		<legend><%|self.title%></legend>
 	<%- end %>
 	<% if self.description and #self.description > 0 then -%>
 		<div class="gluon-section-descr"><%=self.description%></div>
 	<%- end %>
-	<div class="gluon-section-node">
-		<div id="section-<%=id%>">
+	<div class="gluon-section-node" id="section-<%=id%>">
 		<% self:render_children(renderer, scope) %>
 	</div>
-		<% if self.error and self.error[1] then -%>
-			<div class="gluon-section-error">
-				<ul><% for _, e in ipairs(self.error[1]) do -%>
-					<li>
-						<%- if e == "invalid" then -%>
-							<%:One or more fields contain invalid values!%>
-						<%- elseif e == "missing" then -%>
-							<%:One or more required fields have no value!%>
-						<%- else -%>
-							<%|e%>
-						<%- end -%>
-					</li>
-				<%- end %></ul>
-			</div>
-		<%- end %>
-	</div>
 </fieldset>

package/gluon-web-model/files/lib/gluon/web/view/model/tvalue.html

-<textarea class="gluon-input-textarea" <% if not self.size then %> style="width: 100%"<% else %> cols="<%=self.size%>"<% end %> data-update="change"<%= attr("name", id) .. attr("id", id) .. attr("rows", self.rows) .. attr("wrap", self.wrap) %>>
+<textarea <% if not self.size then %> style="width: 100%"<% else %> cols="<%=self.size%>"<% end %> data-update="change"<%= attr("name", id) .. attr("id", id) .. attr("rows", self.rows) .. attr("wrap", self.wrap) %>>
 <%-|self:cfgvalue()-%>
 </textarea>