diff options
44 files changed, 1060 insertions, 181 deletions
diff --git a/applications/luci-app-bcp38/Makefile b/applications/luci-app-bcp38/Makefile new file mode 100644 index 0000000000..9ab5a6701d --- /dev/null +++ b/applications/luci-app-bcp38/Makefile @@ -0,0 +1,18 @@ +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=BCP38 LuCI interface +LUCI_DEPENDS:=+luci-mod-admin-full +bcp38 + +PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk> +PKG_LICENSE:=Apache-2.0 + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-bcp38/luasrc/controller/bcp38.lua b/applications/luci-app-bcp38/luasrc/controller/bcp38.lua new file mode 100644 index 0000000000..7ea22835d6 --- /dev/null +++ b/applications/luci-app-bcp38/luasrc/controller/bcp38.lua @@ -0,0 +1,7 @@ +module("luci.controller.bcp38", package.seeall) + +function index() + entry({"admin", "network", "firewall", "bcp38"}, + cbi("bcp38"), + _("BCP38"), 50).dependent = false +end diff --git a/applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua b/applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua new file mode 100644 index 0000000000..632074a56f --- /dev/null +++ b/applications/luci-app-bcp38/luasrc/model/cbi/bcp38.lua @@ -0,0 +1,60 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2014 Toke Høiland-Jørgensen <toke@toke.dk> + +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 + +$Id$ +]]-- + +local wa = require "luci.tools.webadmin" +local net = require "luci.model.network".init() +local ifaces = net:get_interfaces() + +m = Map("bcp38", translate("BCP38"), + translate("This function blocks packets with private address destinations " .. + "from going out onto the internet as per " .. + "<a href=\"http://tools.ietf.org/html/bcp38\">BCP 38</a>. " .. + "For IPv6, only source specific default routes are installed, so " .. + "no BCP38 firewall routes are needed.")) + +s = m:section(TypedSection, "bcp38", translate("BCP38 config")) +s.anonymous = true +-- BASIC +e = s:option(Flag, "enabled", translate("Enable")) +e.rmempty = false + +a = s:option(Flag, "detect_upstream", translate("Auto-detect upstream IP"), + translate("Attempt to automatically detect if the upstream IP " .. + "will be blocked by the configuration, and add an exception if it will. " .. + "If this does not work correctly, you can add exceptions manually below.")) +a.rmempty = false + +n = s:option(ListValue, "interface", translate("Interface name"), translate("Interface to apply the blocking to " .. + "(should be the upstream WAN interface).")) +for _, iface in ipairs(ifaces) do + if iface:is_up() then + n:value(iface:name()) + end +end +n.rmempty = false + +ma = s:option(DynamicList, "match", + translate("Blocked IP ranges")) + +ma.datatype = "ip4addr" + +nm = s:option(DynamicList, "nomatch", + translate("Allowed IP ranges"), translate("Takes precedence over blocked ranges. ".. + "Use to whitelist your upstream network if you're behind a double NAT " .. + "and the auto-detection doesn't work.")) + +nm.datatype = "ip4addr" + + +return m diff --git a/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38 b/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38 new file mode 100755 index 0000000000..c204236e37 --- /dev/null +++ b/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38 @@ -0,0 +1,11 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@bcp38[-1] + add ucitrack bcp38 + add_list ucitrack.@bcp38[0].affects=firewall + commit ucitrack +EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-app-clamav/Makefile b/applications/luci-app-clamav/Makefile new file mode 100644 index 0000000000..f91e692af8 --- /dev/null +++ b/applications/luci-app-clamav/Makefile @@ -0,0 +1,18 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=ClamAV LuCI interface +LUCI_DEPENDS:=+luci-mod-admin-full +clamav + +PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> +PKG_LICENSE:=Apache-2.0 + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-clamav/luasrc/controller/clamav.lua b/applications/luci-app-clamav/luasrc/controller/clamav.lua new file mode 100644 index 0000000000..02f3bfc4b1 --- /dev/null +++ b/applications/luci-app-clamav/luasrc/controller/clamav.lua @@ -0,0 +1,22 @@ +--[[ + +LuCI ClamAV module + +Copyright (C) 2015, Itus Networks, Inc. + +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 + +Author: Marko Ratkaj <marko.ratkaj@sartura.hr> + Luka Perkov <luka.perkov@sartura.hr> + +]]-- + +module("luci.controller.clamav", package.seeall) + +function index() + entry({"admin", "services", "clamav"}, cbi("clamav"), _("ClamAV")) +end diff --git a/applications/luci-app-clamav/luasrc/model/cbi/clamav.lua b/applications/luci-app-clamav/luasrc/model/cbi/clamav.lua new file mode 100644 index 0000000000..ff98139d4a --- /dev/null +++ b/applications/luci-app-clamav/luasrc/model/cbi/clamav.lua @@ -0,0 +1,178 @@ +--[[ + +LuCI ClamAV module + +Copyright (C) 2015, Itus Networks, Inc. + +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 + +Author: Marko Ratkaj <marko.ratkaj@sartura.hr> + Luka Perkov <luka.perkov@sartura.hr> + +]]-- + +local fs = require "nixio.fs" +local sys = require "luci.sys" +require "ubus" + +m = Map("clamav", translate("ClamAV")) +m.on_after_commit = function() luci.sys.call("/etc/init.d/clamav restart") end + +s = m:section(TypedSection, "clamav") +s.anonymous = true +s.addremove = false + +s:tab("tab_advanced", translate("Settings")) +s:tab("tab_logs", translate("Log")) + +--------------- Settings -------------- + +LogFileMaxSize = s:taboption("tab_advanced", Value, "LogFileMaxSize", translate("Max size of log file")) +LogFileMaxSize:value("512K", translate("512K")) +LogFileMaxSize:value("1M", translate("1M")) +LogFileMaxSize:value("2M", translate("2M")) +LogFileMaxSize.default = "1M" + +LogTime = s:taboption("tab_advanced", ListValue, "LogTime", translate("Log time with each message")) +LogTime:value("no", translate("No")) +LogTime:value("yes", translate("Yes")) +LogTime.default = "no" + +LogVerbose = s:taboption("tab_advanced", ListValue, "LogVerbose", translate("Enable verbose logging")) +LogVerbose:value("no", translate("No")) +LogVerbose:value("yes", translate("Yes")) +LogVerbose.default = "no" + +ExtendedDetectionInfo = s:taboption("tab_advanced", ListValue, "ExtendedDetectionInfo", translate("Log additional infection info")) +ExtendedDetectionInfo:value("no", translate("No")) +ExtendedDetectionInfo:value("yes", translate("Yes")) +ExtendedDetectionInfo.default = "no" + +dummy3 = s:taboption("tab_advanced", DummyValue, "") +dummy4 = s:taboption("tab_advanced", DummyValue, "") + +MaxDirectoryRecursion = s:taboption("tab_advanced", Value, "MaxDirectoryRecursion", translate("Max directory scan depth")) +MaxDirectoryRecursion:value("15", translate("15")) +MaxDirectoryRecursion:value("20", translate("20")) +MaxDirectoryRecursion.default = "15" + +FollowDirectorySymlink = s:taboption("tab_advanced", ListValue, "FollowDirectorySymlink", translate("Follow directory symlinks")) +FollowDirectorySymlink:value("no", translate("No")) +FollowDirectorySymlink:value("yes", translate("Yes")) +FollowDirectorySymlink.default = "no" + +FollowFileSymlinks = s:taboption("tab_advanced", ListValue, "FollowFileSymlinks", translate("Follow file symlinks")) +FollowFileSymlinks:value("no", translate("No")) +FollowFileSymlinks:value("yes", translate("Yes")) +FollowFileSymlinks.default = "no" + +DetectPUA = s:taboption("tab_advanced", ListValue, "DetectPUA", translate("Detect possibly unwanted apps")) +DetectPUA:value("no", translate("No")) +DetectPUA:value("yes", translate("Yes")) +DetectPUA.default = "no" + +ScanPE = s:taboption("tab_advanced", ListValue, "ScanPE", translate("Scan portable executables")) +ScanPE:value("no", translate("No")) +ScanPE:value("yes", translate("Yes")) +ScanPE.default = "yes" + +ScanELF = s:taboption("tab_advanced", ListValue, "ScanELF", translate("Scan ELF files")) +ScanELF:value("no", translate("No")) +ScanELF:value("yes", translate("Yes")) +ScanELF.default = "yes" + +DetectBrokenExecutables = s:taboption("tab_advanced", ListValue, "DetectBrokenExecutables", translate("Detect broken executables")) +DetectBrokenExecutables:value("no", translate("No")) +DetectBrokenExecutables:value("yes", translate("Yes")) +DetectBrokenExecutables.default = "no" + +ScanOLE2 = s:taboption("tab_advanced", ListValue, "ScanOLE2", translate("Scan MS Office and .msi files")) +ScanOLE2:value("no", translate("No")) +ScanOLE2:value("yes", translate("Yes")) +ScanOLE2.default = "yes" + +ScanPDF = s:taboption("tab_advanced", ListValue, "ScanPDF", translate("Scan pdf files")) +ScanPDF:value("no", translate("No")) +ScanPDF:value("yes", translate("Yes")) +ScanPDF.default = "yes" + +ScanSWF = s:taboption("tab_advanced", ListValue, "ScanSWF", translate("Scan swf files")) +ScanSWF:value("no", translate("No")) +ScanSWF:value("yes", translate("Yes")) +ScanSWF.default = "yes" + +ScanMail = s:taboption("tab_advanced", ListValue, "ScanMail", translate("Scan emails")) +ScanMail:value("no", translate("No")) +ScanMail:value("yes", translate("Yes")) +ScanMail.default = "yes" + +ScanPartialMessages = s:taboption("tab_advanced", ListValue, "ScanPartialMessages", translate("Scan RFC1341 messages split over many emails")) +ScanPartialMessages:value("no", translate("No")) +ScanPartialMessages:value("yes", translate("Yes")) +ScanPartialMessages.default = "no" + +ScanArchive = s:taboption("tab_advanced", ListValue, "ScanArchive", translate("Scan archives")) +ScanArchive:value("no", translate("No")) +ScanArchive:value("yes", translate("Yes")) +ScanArchive.default = "yes" + +ArchiveBlockEncrypted = s:taboption("tab_advanced", ListValue, "ArchiveBlockEncrypted", translate("Block encrypted archives")) +ArchiveBlockEncrypted:value("no", translate("No")) +ArchiveBlockEncrypted:value("yes", translate("Yes")) +ArchiveBlockEncrypted.default = "no" + +dummy5 = s:taboption("tab_advanced", DummyValue, "") +dummy6 = s:taboption("tab_advanced", DummyValue, "") + +StreamMinPort = s:taboption("tab_advanced", Value, "StreamMinPort", translate("Port range, lowest port")) +StreamMinPort.datatype = "portrange" +StreamMinPort:value("1024",translate("1024")) +StreamMinPort.default = "1024" + +StreamMaxPort = s:taboption("tab_advanced", Value, "StreamMaxPort", translate("Port range, highest port")) +StreamMaxPort.datatype = "portrange" +StreamMaxPort:value("2048",translate("2048")) +StreamMaxPort.default = "2048" + +MaxThreads = s:taboption("tab_advanced", Value, "MaxThreads", translate("Max number of threads")) +MaxThreads.datatype = "and(uinteger,min(1))" +MaxThreads:value("10",translate("10")) +MaxThreads:value("20",translate("20")) +MaxThreads.default = "10" + +SelfCheck = s:taboption("tab_advanced", Value, "SelfCheck", translate("Database check every N sec")) +SelfCheck.datatype = "and(uinteger,min(1))" +SelfCheck:value("600",translate("600")) +SelfCheck.default = "600" + +MaxFileSize = s:taboption("tab_advanced", Value, "MaxFileSize", translate("Max size of scanned file")) +MaxFileSize.datatype = "string" +MaxFileSize:value("150M",translate("150M")) +MaxFileSize:value("50M",translate("50M")) +MaxFileSize.default = "150M" + +------------------ Log -------------------- + +clamav_logfile = s:taboption("tab_logs", TextValue, "lines", "") +clamav_logfile.wrap = "off" +clamav_logfile.rows = 25 +clamav_logfile.rmempty = true + +function clamav_logfile.cfgvalue() + local uci = require "luci.model.uci".cursor_state() + local file = "/tmp/clamd.log" + if file then + return fs.readfile(file) or "" + else + return "" + end +end + +function clamav_logfile.write() +end + +return m diff --git a/applications/luci-app-e2guardian/Makefile b/applications/luci-app-e2guardian/Makefile new file mode 100644 index 0000000000..c3ac029885 --- /dev/null +++ b/applications/luci-app-e2guardian/Makefile @@ -0,0 +1,18 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=E2Guardian LuCI Interface +LUCI_DEPENDS:=+luci-mod-admin-full +e2guardian + +PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> +PKG_LICENSE:=Apache-2.0 + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-e2guardian/luasrc/controller/e2guardian.lua b/applications/luci-app-e2guardian/luasrc/controller/e2guardian.lua new file mode 100644 index 0000000000..dd545f50ba --- /dev/null +++ b/applications/luci-app-e2guardian/luasrc/controller/e2guardian.lua @@ -0,0 +1,22 @@ +--[[ + +LuCI E2Guardian module + +Copyright (C) 2015, Itus Networks, Inc. + +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 + +Author: Marko Ratkaj <marko.ratkaj@sartura.hr> + Luka Perkov <luka.perkov@sartura.hr> + +]]-- + +module("luci.controller.e2guardian", package.seeall) + +function index() + entry({"admin", "services", "e2guardian"}, cbi("e2guardian"), _("E2Guardian")) +end diff --git a/applications/luci-app-e2guardian/luasrc/model/cbi/e2guardian.lua b/applications/luci-app-e2guardian/luasrc/model/cbi/e2guardian.lua new file mode 100644 index 0000000000..b62132108c --- /dev/null +++ b/applications/luci-app-e2guardian/luasrc/model/cbi/e2guardian.lua @@ -0,0 +1,399 @@ +--[[ + +LuCI E2Guardian module + +Copyright (C) 2015, Itus Networks, Inc. + +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 + +Author: Marko Ratkaj <marko.ratkaj@sartura.hr> + Luka Perkov <luka.perkov@sartura.hr> + +]]-- + +local fs = require "nixio.fs" +local sys = require "luci.sys" + +m = Map("e2guardian", translate("E2Guardian")) +m.on_after_commit = function() luci.sys.call("/etc/init.d/e2guardian restart") end + +s = m:section(TypedSection, "e2guardian") +s.anonymous = true +s.addremove = false + +s:tab("tab_general", translate("General Settings")) +s:tab("tab_additional", translate("Additional Settings")) +s:tab("tab_logs", translate("Logs")) + + +----------------- General Settings Tab ----------------------- + +filterip = s:taboption("tab_general", Value, "filterip", translate("IP that E2Guardian listens")) +filterip.datatype = "ip4addr" + +filterports = s:taboption("tab_general", Value, "filterports", translate("Port that E2Guardian listens")) +filterports.datatype = "portrange" +filterports.placeholder = "0-65535" + +proxyip = s:taboption("tab_general", Value, "proxyip", translate("IP address of the proxy")) +proxyip.datatype = "ip4addr" +proxyip.default = "127.0.0.1" + +proxyport = s:taboption("tab_general", Value, "proxyport", translate("Port of the proxy")) +proxyport.datatype = "portrange" +proxyport.placeholder = "0-65535" + +languagedir = s:taboption("tab_general", Value, "languagedir", translate("Language dir")) +languagedir.datatype = "string" +languagedir.default = "/usr/share/e2guardian/languages" + +language = s:taboption("tab_general", Value, "language", translate("Language to use")) +language.datatype = "string" +language.default = "ukenglish" + +loglevel = s:taboption("tab_general", ListValue, "loglevel", translate("Logging Settings")) +loglevel:value("0", translate("none")) +loglevel:value("1", translate("just denied")) +loglevel:value("2", translate("all text based")) +loglevel:value("3", translate("all requests")) +loglevel.default = "2" + +logexceptionhits = s:taboption("tab_general", ListValue, "logexceptionhits", translate("Log Exception Hits")) +logexceptionhits:value("0", translate("never")) +logexceptionhits:value("1", translate("log, but don't mark as exceptions")) +logexceptionhits:value("2", translate("log and mark")) +logexceptionhits.default = "2" + +logfileformat = s:taboption("tab_general", ListValue, "logfileformat", translate("Log File Format")) +logfileformat:value("1", translate("DansgGuardian format, space delimited")) +logfileformat:value("2", translate("CSV-style format")) +logfileformat:value("3", translate("Squid Log File Format")) +logfileformat:value("4", translate("Tab delimited")) +logfileformat:value("5", translate("Protex format")) +logfileformat:value("6", translate("Protex format with server field blanked")) +logfileformat.default = "1" + +accessdeniedaddress = s:taboption("tab_general", Value, "accessdeniedaddress", translate("Access denied address"), +translate("Server to which the cgi e2guardian reporting script was copied. Reporting levels 1 and 2 only")) +accessdeniedaddress.datatype = "string" +accessdeniedaddress.default = "http://YOURSERVER.YOURDOMAIN/cgi-bin/e2guardian.pl" + +usecustombannedimage = s:taboption("tab_general", ListValue, "usecustombannedimage", translate("Banned image replacement")) +usecustombannedimage:value("on", translate("Yes")) +usecustombannedimage:value("off", translate("No")) +usecustombannedimage.default = "on" + +custombannedimagefile = s:taboption("tab_general", Value, "custombannedimagefile", translate("Custom banned image file")) +custombannedimagefile.datatype = "string" +custombannedimagefile.default = "/usr/share/e2guardian/transparent1x1.gif" + +usecustombannedflash = s:taboption("tab_general", ListValue, "usecustombannedflash", translate("Banned flash replacement")) +usecustombannedflash:value("on", translate("Yes")) +usecustombannedflash:value("off", translate("No")) +usecustombannedflash.default = "on" + +custombannedflashfile = s:taboption("tab_general", Value, "custombannedflashfile", translate("Custom banned flash file")) +custombannedflashfile.datatype = "string" +custombannedflashfile.default = "/usr/share/e2guardian/blockedflash.swf" + +filtergroups = s:taboption("tab_general", Value, "filtergroups", translate("Number of filter groups")) +filtergroups.datatype = "and(uinteger,min(1))" +filtergroups.default = "1" + +filtergroupslist = s:taboption("tab_general", Value, "filtergroupslist", translate("List of filter groups")) +filtergroupslist.datatype = "string" +filtergroupslist.default = "/etc/e2guardian/lists/filtergroupslist" + +bannediplist = s:taboption("tab_general", Value, "bannediplist", translate("List of banned IPs")) +bannediplist.datatype = "string" +bannediplist.default = "/etc/e2guardian/lists/bannediplist" + +exceptioniplist = s:taboption("tab_general", Value, "exceptioniplist", translate("List of IP exceptions")) +exceptioniplist.datatype = "string" +exceptioniplist.default = "/etc/e2guardian/lists/exceptioniplist" + +perroomblockingdirectory = s:taboption("tab_general", Value, "perroomblockingdirectory", translate("Per-Room blocking definition directory")) +perroomblockingdirectory.datatype = "string" +perroomblockingdirectory.default = "/etc/e2guardian/lists/bannedrooms/" + +showweightedfound = s:taboption("tab_general", ListValue, "showweightedfound", translate("Show weighted phrases found")) +showweightedfound:value("on", translate("Yes")) +showweightedfound:value("off", translate("No")) +showweightedfound.default = "on" + +weightedphrasemode = s:taboption("tab_general", ListValue, "weightedphrasemode", translate("Weighted phrase mode")) +weightedphrasemode:value("0", translate("off")) +weightedphrasemode:value("1", translate("on, normal operation")) +weightedphrasemode:value("2", translate("on, phrase found only counts once on a page")) +weightedphrasemode.default = "2" + +urlcachenumber = s:taboption("tab_general", Value, "urlcachenumber", translate("Clean result caching for URLs")) +urlcachenumber.datatype = "and(uinteger,min(0))" +urlcachenumber.default = "1000" + +urlcacheage = s:taboption("tab_general", Value, "urlcacheage", translate("Age before they should be ignored in seconds")) +urlcacheage.datatype = "and(uinteger,min(0))" +urlcacheage.default = "900" + +scancleancache = s:taboption("tab_general", ListValue, "scancleancache", translate("Cache for content (AV) scans as 'clean'")) +scancleancache:value("on", translate("Yes")) +scancleancache:value("off", translate("No")) +scancleancache.default = "on" + +phrasefiltermode = s:taboption("tab_general", ListValue, "phrasefiltermode", translate("Filtering options")) +phrasefiltermode:value("0", translate("raw")) +phrasefiltermode:value("1", translate("smart")) +phrasefiltermode:value("2", translate("both raw and smart")) +phrasefiltermode:value("3", translate("meta/title")) +phrasefiltermode.default = "2" + +preservecase = s:taboption("tab_general", ListValue, "perservecase", translate("Lower caseing options")) +preservecase:value("0", translate("force lower case")) +preservecase:value("1", translate("don't change")) +preservecase:value("2", translate("scan fist in lower, then in original")) +preservecase.default = "0" + +hexdecodecontent = s:taboption("tab_general", ListValue, "hexdecodecontent", translate("Hex decoding options")) +hexdecodecontent:value("on", translate("Yes")) +hexdecodecontent:value("off", translate("No")) +hexdecodecontent.default = "off" + +forcequicksearch = s:taboption("tab_general", ListValue, "forcequicksearch", translate("Quick search")) +forcequicksearch:value("on", translate("Yes")) +forcequicksearch:value("off", translate("No")) +forcequicksearch.default = "off" + +reverseaddresslookups= s:taboption("tab_general", ListValue, "reverseaddresslookups", translate("Reverse lookups for banned site and URLs")) +reverseaddresslookups:value("on", translate("Yes")) +reverseaddresslookups:value("off", translate("No")) +reverseaddresslookups.default = "off" + +reverseclientiplookups = s:taboption("tab_general", ListValue, "reverseclientiplookups", translate("Reverse lookups for banned and exception IP lists")) +reverseclientiplookups:value("on", translate("Yes")) +reverseclientiplookups:value("off", translate("No")) +reverseclientiplookups.default = "off" + +logclienthostnames = s:taboption("tab_general", ListValue, "logclienthostnames", translate("Perform reverse lookups on client IPs for successful requests")) +logclienthostnames:value("on", translate("Yes")) +logclienthostnames:value("off", translate("No")) +logclienthostnames.default = "off" + +createlistcachefiles = s:taboption("tab_general", ListValue, "createlistcachefiles", translate("Build bannedsitelist and bannedurllist cache files")) +createlistcachefiles:value("on",translate("Yes")) +createlistcachefiles:value("off",translate("No")) +createlistcachefiles.default = "on" + +prefercachedlists = s:taboption("tab_general", ListValue, "prefercachedlists", translate("Prefer cached list files")) +prefercachedlists:value("on", translate("Yes")) +prefercachedlists:value("off", translate("No")) +prefercachedlists.default = "off" + +maxuploadsize = s:taboption("tab_general", Value, "maxuploadsize", translate("Max upload size (in Kbytes)")) +maxuploadsize:value("-1", translate("no blocking")) +maxuploadsize:value("0", translate("complete block")) +maxuploadsize.default = "-1" + +maxcontentfiltersize = s:taboption("tab_general", Value, "maxcontentfiltersize", translate("Max content filter size"), +translate("The value must not be higher than max content ram cache scan size or 0 to match it")) +maxcontentfiltersize.datatype = "and(uinteger,min(0))" +maxcontentfiltersize.default = "256" + +maxcontentramcachescansize = s:taboption("tab_general", Value, "maxcontentramcachescansize", translate("Max content ram cache scan size"), +translate("This is the max size of file that DG will download and cache in RAM")) +maxcontentramcachescansize.datatype = "and(uinteger,min(0))" +maxcontentramcachescansize.default = "2000" + +maxcontentfilecachescansize = s:taboption("tab_general", Value, "maxcontentfilecachescansize", translate("Max content file cache scan size")) +maxcontentfilecachescansize.datatype = "and(uinteger,min(0))" +maxcontentfilecachescansize.default = "20000" + +proxytimeout = s:taboption("tab_general", Value, "proxytimeout", translate("Proxy timeout (5-100)")) +proxytimeout.datatype = "range(5,100)" +proxytimeout.default = "20" + +proxyexchange = s:taboption("tab_general", Value, "proxyexchange", translate("Proxy header excahnge (20-300)")) +proxyexchange.datatype = "range(20,300)" +proxyexchange.default = "20" + +pcontimeout = s:taboption("tab_general", Value, "pcontimeout", translate("Pconn timeout"), +translate("How long a persistent connection will wait for other requests")) +pcontimeout.datatype = "range(5,300)" +pcontimeout.default = "55" + +filecachedir = s:taboption("tab_general", Value, "filecachedir", translate("File cache directory")) +filecachedir.datatype = "string" +filecachedir.default = "/tmp" + +deletedownloadedtempfiles = s:taboption("tab_general", ListValue, "deletedownloadedtempfiles", translate("Delete file cache after user completes download")) +deletedownloadedtempfiles:value("on", translate("Yes")) +deletedownloadedtempfiles:value("off", translate("No")) +deletedownloadedtempfiles.default = "on" + +initialtrickledelay = s:taboption("tab_general", Value, "initialtrickledelay", translate("Initial Trickle delay"), +translate("Number of seconds a browser connection is left waiting before first being sent *something* to keep it alive")) +initialtrickledelay.datatype = "and(uinteger,min(0))" +initialtrickledelay.default = "20" + +trickledelay = s:taboption("tab_general", Value, "trickledelay", translate("Trickle delay"), +translate("Number of seconds a browser connection is left waiting before being sent more *something* to keep it alive")) +trickledelay.datatype = "and(uinteger,min(0))" +trickledelay.default = "10" + +downloadmanager = s:taboption("tab_general", Value, "downloadmanager", translate("Download manager")) +downloadmanager.datatype = "string" +downloadmanager.default = "/etc/e2guardian/downloadmanagers/default.conf" + +contentscannertimeout = s:taboption("tab_general", Value, "contentscannertimeout", translate("Content scanner timeout")) +contentscannertimeout.datatype = "and(uinteger,min(0))" +contentscannertimeout.default = "60" + +contentscanexceptions = s:taboption("tab_general", ListValue, "contentscanexceptions", translate("Content scan exceptions")) +contentscanexceptions:value("on", translate("Yes")) +contentscanexceptions:value("off", translate("No")) +contentscanexceptions.default = "off" + +recheckreplacedurls = s:taboption("tab_general", ListValue, "recheckreplacedurls", translate("e-check replaced URLs")) +recheckreplacedurls:value("on", translate("Yes")) +recheckreplacedurls:value("off", translate("No")) +recheckreplacedurls.default = "off" + +forwardedfor = s:taboption("tab_general", ListValue, "forwardedfor", translate("Misc setting: forwardedfor"), +translate("If on, it may help solve some problem sites that need to know the source ip.")) +forwardedfor:value("on", translate("Yes")) +forwardedfor:value("off", translate("No")) +forwardedfor.default = "off" + +usexforwardedfor = s:taboption("tab_general", ListValue, "usexforwardedfor", translate("Misc setting: usexforwardedfor"), +translate("This is for when you have squid between the clients and E2Guardian")) +usexforwardedfor:value("on", translate("Yes")) +usexforwardedfor:value("off", translate("No")) +usexforwardedfor.default = "off" + +logconnectionhandlingerrors = s:taboption("tab_general", ListValue, "logconnectionhandlingerrors", translate("Log debug info about log()ing and accept()ing")) +logconnectionhandlingerrors:value("on", translate("Yes")) +logconnectionhandlingerrors:value("off", translate("No")) +logconnectionhandlingerrors.default = "on" + +logchildprocesshandling = s:taboption("tab_general", ListValue, "logchildprocesshandling", translate("Log child process handling")) +logchildprocesshandling:value("on", translate("Yes")) +logchildprocesshandling:value("off", translate("No")) +logchildprocesshandling.default = "off" + +maxchildren = s:taboption("tab_general", Value, "maxchildren", translate("Max number of processes to spawn")) +maxchildren.datatype = "and(uinteger,min(0))" +maxchildren.default = "180" + +minchildren = s:taboption("tab_general", Value, "minchildren", translate("Min number of processes to spawn")) +minchildren.datatype = "and(uinteger,min(0))" +minchildren.default = "20" + +minsparechildren = s:taboption("tab_general", Value, "minsparechildren", translate("Min number of processes to keep ready")) +minsparechildren.datatype = "and(uinteger,min(0))" +minsparechildren.default = "16" + +preforkchildren = s:taboption("tab_general", Value, "preforkchildren", translate("Sets minimum nuber of processes when it runs out")) +preforkchildren.datatype = "and(uinteger,min(0))" +preforkchildren.default = "10" + +maxsparechildren = s:taboption("tab_general", Value, "maxsparechildren", translate("Sets the maximum number of processes to have doing nothing")) +maxsparechildren.datatype = "and(uinteger,min(0))" +maxsparechildren.default = "32" + +maxagechildren = s:taboption("tab_general", Value, "maxagechildren", translate("Max age of child process")) +maxagechildren.datatype = "and(uinteger,min(0))" +maxagechildren.default = "500" + +maxips = s:taboption("tab_general", Value, "maxips", translate("Max number of clinets allowed to connect")) +maxips:value("0", translate("no limit")) +maxips.default = "0" + +ipipcfilename = s:taboption("tab_general", Value, "ipipcfilename", translate("IP list IPC server directory and filename")) +ipipcfilename.datatype = "string" +ipipcfilename.default = "/tmp/.dguardianipc" + +urlipcfilename = s:taboption("tab_general", Value, "urlipcfilename", translate("Defines URL list IPC server directory and filename used to communicate with the URL cache process")) +urlipcfilename.datatype = "string" +urlipcfilename.default = "/tmp/.dguardianurlipc" + +ipcfilename = s:taboption("tab_general", Value, "ipcfilename", translate("Defines URL list IPC server directory and filename used to communicate with the URL cache process")) +ipcfilename.datatype = "string" +ipcfilename.default = "/tmp/.dguardianipipc" + +nodeamon = s:taboption("tab_general", ListValue, "nodeamon", translate("Disable deamoning")) +nodeamon:value("on", translate("Yes")) +nodeamon:value("off", translate("No")) +nodeamon.default = "off" + +nologger = s:taboption("tab_general", ListValue, "nologger", translate("Disable logger")) +nologger:value("on", translate("Yes")) +nologger:value("off", translate("No")) +nologger.default = "off" + +logadblock = s:taboption("tab_general", ListValue, "logadblock", translate("Enable logging of ADs")) +logadblock:value("on", translate("Yes")) +logadblock:value("off", translate("No")) +logadblock.default = "off" + +loguseragent = s:taboption("tab_general", ListValue, "loguseragent", translate("Enable logging of client user agent")) +loguseragent:value("on", translate("Yes")) +loguseragent:value("off", translate("No")) +loguseragent.default = "off" + +softrestart = s:taboption("tab_general", ListValue, "softrestart", translate("Enable soft restart")) +softrestart:value("on", translate("Yes")) +softrestart:value("off", translate("No")) +softrestart.default = "off" + + +------------------------ Additional Settings Tab ---------------------------- + +e2guardian_config_file = s:taboption("tab_additional", TextValue, "_data", "") +e2guardian_config_file.wrap = "off" +e2guardian_config_file.rows = 25 +e2guardian_config_file.rmempty = false + +function e2guardian_config_file.cfgvalue() + local uci = require "luci.model.uci".cursor_state() + file = "/etc/e2guardian/e2guardianf1.conf" + if file then + return fs.readfile(file) or "" + else + return "" + end +end + +function e2guardian_config_file.write(self, section, value) + if value then + local uci = require "luci.model.uci".cursor_state() + file = "/etc/e2guardian/e2guardianf1.conf" + fs.writefile(file, value:gsub("\r\n", "\n")) + end +end + + +---------------------------- Logs Tab ----------------------------- + +e2guardian_logfile = s:taboption("tab_logs", TextValue, "lines", "") +e2guardian_logfile.wrap = "off" +e2guardian_logfile.rows = 25 +e2guardian_logfile.rmempty = true + +function e2guardian_logfile.cfgvalue() + local uci = require "luci.model.uci".cursor_state() + file = "/tmp/e2guardian/access.log" + if file then + return fs.readfile(file) or "" + else + return "Can't read log file" + end +end + +function e2guardian_logfile.write() + return "" +end + +return m diff --git a/applications/luci-app-squid/Makefile b/applications/luci-app-squid/Makefile new file mode 100644 index 0000000000..82802c0e5a --- /dev/null +++ b/applications/luci-app-squid/Makefile @@ -0,0 +1,18 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Squid LuCI Interface +LUCI_DEPENDS:=+luci-mod-admin-full +squid + +PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> +PKG_LICENSE:=Apache-2.0 + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-squid/luasrc/controller/squid.lua b/applications/luci-app-squid/luasrc/controller/squid.lua new file mode 100644 index 0000000000..09946a1511 --- /dev/null +++ b/applications/luci-app-squid/luasrc/controller/squid.lua @@ -0,0 +1,21 @@ +--[[ + +LuCI Squid module + +Copyright (C) 2015, OpenWrt.org + +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 + +Author: Marko Ratkaj <marko.ratkaj@sartura.hr> + +]]-- + +module("luci.controller.squid", package.seeall) + +function index() + entry({"admin", "services", "squid"}, cbi("squid"), _("Squid")) +end diff --git a/applications/luci-app-squid/luasrc/model/cbi/squid.lua b/applications/luci-app-squid/luasrc/model/cbi/squid.lua new file mode 100644 index 0000000000..0ac554a3ee --- /dev/null +++ b/applications/luci-app-squid/luasrc/model/cbi/squid.lua @@ -0,0 +1,67 @@ +--[[ + +LuCI Squid module + +Copyright (C) 2015, OpenWrt.org + +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 + +Author: Marko Ratkaj <marko.ratkaj@sartura.hr> + +]]-- + +local fs = require "nixio.fs" +local sys = require "luci.sys" +require "ubus" + +m = Map("squid", translate("Squid")) +m.on_after_commit = function() luci.sys.call("/etc/init.d/squid restart") end + +s = m:section(TypedSection, "squid") +s.anonymous = true +s.addremove = false + +s:tab("general", translate("General Settings")) + +http_port = s:taboption("general", Value, "http_port", translate("Port")) +http_port.datatype = "portrange" +http_port.placeholder = "0-65535" + +visible_hostname = s:taboption("general", Value, "visible_hostname", translate("Visible Hostname")) +visible_hostname.datatype="string" +visible_hostname.placeholder = "OpenWrt" + +coredump_dir = s:taboption("general", Value, "coredump_dir", translate("Coredump files directory")) +coredump_dir.datatype="string" +coredump_dir.placeholder = "/tmp/squid" + +s:tab("advanced", translate("Advanced Settings")) + +squid_config_file = s:taboption("advanced", TextValue, "_data", "") +squid_config_file.wrap = "off" +squid_config_file.rows = 25 +squid_config_file.rmempty = false + +function squid_config_file.cfgvalue() + local uci = require "luci.model.uci".cursor_state() + local file = uci:get("squid", "squid", "config_file") + if file then + return fs.readfile(file) or "" + else + return "" + end +end + +function squid_config_file.write(self, section, value) + if value then + local uci = require "luci.model.uci".cursor_state() + local file = uci:get("squid", "squid", "config_file") + fs.writefile(file, value:gsub("\r\n", "\n")) + end +end + +return m diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua index 0a180d3664..62b0e0f617 100644 --- a/modules/luci-base/luasrc/cbi/datatypes.lua +++ b/modules/luci-base/luasrc/cbi/datatypes.lua @@ -1,4 +1,5 @@ -- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org> +-- Copyright 2017 Dan Luedtke <mail@danrl.com> -- Licensed to the public under the Apache License 2.0. local fs = require "nixio.fs" @@ -165,6 +166,14 @@ function ipmask6(val) return ip6addr(ip or val) end +function ip6hostid(val) + if val and val:match("^[a-fA-F0-9:]+$") and (#val > 2) then + return (ip6addr("2001:db8:0:0" .. val) or ip6addr("2001:db8:0:0:" .. val)) + end + + return false +end + function port(val) val = tonumber(val) return ( val and val >= 0 and val <= 65535 ) @@ -268,17 +277,24 @@ function wepkey(val) end function hexstring(val) - if val then - return (val:match("^[a-fA-F0-9]+$") ~= nil) - end - return false + if val then + return (val:match("^[a-fA-F0-9]+$") ~= nil) + end + return false +end + +function base64(val) + if val then + return (val:match("^[a-zA-Z0-9/+]+=?=?$") ~= nil) and (math.fmod(#val, 4) == 0) + end + return false end function string(val) return true -- Everything qualifies as valid string end -function directory( val, seen ) +function directory(val, seen) local s = fs.stat(val) seen = seen or { } @@ -294,7 +310,7 @@ function directory( val, seen ) return false end -function file( val, seen ) +function file(val, seen) local s = fs.stat(val) seen = seen or { } @@ -310,7 +326,7 @@ function file( val, seen ) return false end -function device( val, seen ) +function device(val, seen) local s = fs.stat(val) seen = seen or { } @@ -445,4 +461,3 @@ function dateyyyymmdd(val) end return false end - diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 21127042d5..f72c2a634b 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -1732,17 +1732,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2671,7 +2671,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 079bce729e..3f6a4e10b9 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -1747,17 +1747,17 @@ msgstr "" "přeposílat požadavky" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2710,7 +2710,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index a936d9d23e..ea2d7c917e 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -1747,17 +1747,17 @@ msgstr "" "Requests weitergeleitet werden" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2716,7 +2716,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 8a2423a959..8b11a99f08 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -1760,17 +1760,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2702,7 +2702,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index d84c28e6ed..e11c0faac9 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -1729,17 +1729,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2668,7 +2668,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 3217ddd2b8..bfc0305a2e 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -1761,17 +1761,17 @@ msgstr "" "enviar solicitudes" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2722,7 +2722,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 59a81733b7..8e610fb864 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -1772,17 +1772,17 @@ msgstr "" "Name System\">DNS</abbr>" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2735,7 +2735,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 4b938412da..70a1238e53 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -1704,17 +1704,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2636,7 +2636,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 9fc2703e2e..700efd964d 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -1761,17 +1761,17 @@ msgstr "" "kérések továbbításra kerülnek" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2727,7 +2727,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 82d4d4e2cb..06ae794f85 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -1763,17 +1763,17 @@ msgstr "" "inoltrare le richieste in" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2710,7 +2710,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 04030c99cd..f6ac3bebf4 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -1755,17 +1755,17 @@ msgstr "" "リストを設定します" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2724,10 +2724,10 @@ msgstr "ピアの公開鍵（必須）" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" "'フル' バージョンの wpad/hostapd と、無線LANドライバーによるサポートが必要で" -"す。<br>（2017年2月現在: ath9k と ath10k、LEDE内では mwlwifi と mt76）" +"す。<br />（2017年2月現在: ath9k と ath10k、LEDE内では mwlwifi と mt76）" msgid "" "Requires upstream supports DNSSEC; verify unsigned domain responses really " diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index f473301aad..59372bd976 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -1721,17 +1721,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2663,7 +2663,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index bf2960798b..517d237d91 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -1700,17 +1700,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2639,7 +2639,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index fdb0435784..d17e4aadd9 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -1739,17 +1739,17 @@ msgstr "" "forespørsler blir videresendt til" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2700,7 +2700,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 2aefc80e2b..8b0368bdeb 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -1784,17 +1784,17 @@ msgstr "" "przekazywane zapytania" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2749,7 +2749,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index 98cf52ca96..413cc79296 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -1780,17 +1780,17 @@ msgstr "" "encaminhar as requisições" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2755,7 +2755,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 8075b0b49f..389b077a32 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -1763,17 +1763,17 @@ msgstr "" "onde encaminhar os pedidos" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2719,7 +2719,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 291c5a80fe..365574b174 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -1701,17 +1701,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2632,7 +2632,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 50a1b15206..d11fbc2cde 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -1767,17 +1767,17 @@ msgstr "" "перенаправления запросов" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2730,7 +2730,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index 737952ebe3..017865d138 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -1676,17 +1676,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2605,7 +2605,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index fea99e2cbd..e7e437fe5c 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -1682,17 +1682,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2611,7 +2611,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index 1a0235f9f3..cc47c2c6f2 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -1669,17 +1669,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2598,7 +2598,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 6c23aca2fb..09312734a2 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -1689,17 +1689,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2618,7 +2618,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index dd0d14f149..5abf039e85 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -1774,17 +1774,17 @@ msgstr "" "пересилати запити" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2743,7 +2743,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index ee7147febe..162bd30664 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -1704,17 +1704,17 @@ msgid "" msgstr "" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2643,7 +2643,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index eff9c8497f..dca93f0a19 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -1700,17 +1700,17 @@ msgid "" msgstr "将指定的域名DNS解析转发到指定的DNS服务器（按照示例填写）" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2643,7 +2643,7 @@ msgstr "必须，Peer的公钥。" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index 1e90bf58bf..8f759b8d5f 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -1712,17 +1712,17 @@ msgid "" msgstr "列出 <abbr title=\"Domain Name System\">DNS</abbr> 伺服器以便轉發請求" msgid "" -"List of R0KHs in the same Mobility Domain. <br>Format: MAC-address,NAS-" -"Identifier,128-bit key as hex string. <br>This list is used to map R0KH-ID " +"List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-" +"Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID " "(NAS Identifier) to a destination MAC address when requesting PMK-R1 key " "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" msgid "" -"List of R1KHs in the same Mobility Domain. <br>Format: MAC-address,R1KH-ID " -"as 6 octets with colons,128-bit key as hex string. <br>This list is used to " -"map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " +"List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID " +"as 6 octets with colons,128-bit key as hex string. <br />This list is used " +"to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the " "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" @@ -2657,7 +2657,7 @@ msgstr "" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " -"<br>(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" +"<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" msgid "" diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua index d49786e541..33a8892ece 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -967,8 +967,8 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then r0kh = s:taboption("encryption", DynamicList, "r0kh", translate("External R0 Key Holder List"), translate("List of R0KHs in the same Mobility Domain. " .. - "<br>Format: MAC-address,NAS-Identifier,128-bit key as hex string. " .. - "<br>This list is used to map R0KH-ID (NAS Identifier) to a destination " .. + "<br />Format: MAC-address,NAS-Identifier,128-bit key as hex string. " .. + "<br />This list is used to map R0KH-ID (NAS Identifier) to a destination " .. "MAC address when requesting PMK-R1 key from the R0KH that the STA " .. "used during the Initial Mobility Domain Association.")) @@ -977,8 +977,8 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then r1kh = s:taboption("encryption", DynamicList, "r1kh", translate("External R1 Key Holder List"), translate ("List of R1KHs in the same Mobility Domain. ".. - "<br>Format: MAC-address,R1KH-ID as 6 octets with colons,128-bit key as hex string. ".. - "<br>This list is used to map R1KH-ID to a destination MAC address " .. + "<br />Format: MAC-address,R1KH-ID as 6 octets with colons,128-bit key as hex string. ".. + "<br />This list is used to map R1KH-ID to a destination MAC address " .. "when sending PMK-R1 key from the R0KH. This is also the " .. "list of authorized R1KHs in the MD that can request PMK-R1 keys.")) r1kh:depends({ieee80211r="1"}) @@ -1125,10 +1125,12 @@ end -- ieee802.11w options if hwtype == "mac80211" then + local has_ap_eap = (os.execute("hostapd -veap >/dev/null 2>/dev/null") == 0) + if has_ap_eap then ieee80211w = s:taboption("encryption", ListValue, "ieee80211w", translate("802.11w Management Frame Protection"), translate("Requires the 'full' version of wpad/hostapd " .. - "and support from the wifi driver <br>(as of Feb 2017: " .. + "and support from the wifi driver <br />(as of Feb 2017: " .. "ath9k and ath10k, in LEDE also mwlwifi and mt76)")) ieee80211w.default = "0" ieee80211w.rmempty = true @@ -1159,6 +1161,7 @@ if hwtype == "mac80211" then retry_timeout.datatype = "uinteger" retry_timeout.placeholder = "201" retry_timeout.rmempty = true + end end if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then diff --git a/protocols/luci-proto-wireguard/Makefile b/protocols/luci-proto-wireguard/Makefile index ed94a557b6..0dc70cf31e 100644 --- a/protocols/luci-proto-wireguard/Makefile +++ b/protocols/luci-proto-wireguard/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for WireGuard VPN LUCI_DEPENDS:=+kmod-wireguard +wireguard-tools +LUCI_PKGARCH:=all PKG_MAINTAINER:=Dan Luedtke <mail@danrl.com> diff --git a/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua b/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua index de4ece3471..d950081197 100644 --- a/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua +++ b/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua @@ -19,7 +19,7 @@ private_key = section:taboption( translate("Required. Base64-encoded private key for this interface.") ) private_key.password = true -private_key.datatype = "rangelength(44, 44)" +private_key.datatype = "and(base64,rangelength(44, 44))" private_key.optional = false @@ -76,11 +76,12 @@ preshared_key = section:taboption( Value, "preshared_key", translate("Preshared Key"), - translate("Optional. Adds in an additional layer of symmetric-key " .. + translate("Optional. Base64-encoded preshared key. " .. + "Adds in an additional layer of symmetric-key " .. "cryptography for post-quantum resistance.") ) preshared_key.password = true -preshared_key.datatype = "rangelength(44, 44)" +preshared_key.datatype = "and(base64,rangelength(44, 44))" preshared_key.optional = true @@ -102,9 +103,9 @@ public_key = peers:option( Value, "public_key", translate("Public Key"), - translate("Required. Public key of peer.") + translate("Required. Base64-encoded public key of peer.") ) -public_key.datatype = "rangelength(44, 44)" +public_key.datatype = "and(base64,rangelength(44, 44))" public_key.optional = false |