"Content-Type: text/plain; charset=UTF-8" was wrote twice in each
of base.po and firewall.po, and one was an incorrect place which
was the cause of the errors.
And, The escape in abbr HTML tag was incorrect, so I fixed it.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
DDns script call another sh script to check ddns-scripts version. We can use the quicker IPKG.info function instead of execute another slow command.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
When creating a forwarding rule with protocol set to other, a user is
forwarded to the configuration page. The URL for the configuration page
contained a typo - the user was forwarded to
admin/network/firewall/redirect/cfg... and not
admin/network/firewall/forwards/cfg..., leading to a 404.
Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
It's currently possible to generate nonsensical firewall rules by inputting
combinations which include:
i) protocols other than UDP/TCP
ii) source and destination ports.
There is some discussion of the issue on the forum here and the issue is
here; #1850.
This patch makes fields like src_port and dest_port depend on protocol being
tcp, udp or "tcp udp" in the input, forwarding and source NAT forms.
Signed-off-by: Tom Hodder <tom@limepepper.co.uk>
[reword commit message, squash commits]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Along with 74be6f397
("treewide: switch firewall zone, network and iface lists to dropdown code"),
this change allows luci-app-firewall to recognize OUTPUT rules.
Fixes#1457.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Also switch one usage of raw '<%_ ... %>' interpolation to '<%: ... %>' in
order to avoid issues with translations using apostrophes.
Globally resnyc translations after the fix.
Fixes#1866.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Also switch the weekday and monthday lists in the firewall rule details to
cbi dropdowns, vastly uncluttering the form.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Currently these params should be optional but in the current script then are required for any configuration to save. We add an "optional" boolean value to the validate function so that we can make this pram optional as it should be. Also adds me as maintainer
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
* wait/lock "create" button until the real end of container creation,
this includes download time plus tar/gz processing time
* cosmetics
Signed-off-by: Dirk Brenken <dev@brenken.org>
Every request directed to the ddns app call ddns tools module.
Ddns tools module have lots of global variable that call slow os.execute function. This adds 10 second to every ddns request even if the function that is requested doesn't need that global variable. This commit introduce env_info function that execute os.execute command by executing what is actually requested and not process all the variables. Also remove 2 unecessary module that are not used. More researh find that major slowdown was caused by the calling of ddns script for the version check. Now we check if opkg is present and use it to check ddns-scripts version.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
* migrate JS generated HTML tables to divs
* remove (most of) the inline styles
* various markup cleanups
That's the final part ... hopefully it's now in a more usable &
maintainable state.
Signed-off-by: Dirk Brenken <dev@brenken.org>
Mostly convert HTML tables to div based markup to allow for easier styling
in the future. Also change JS accessor code accordingly.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
The issue existed since the first revision of the rewrite and was
exposed by commit 4024d4f (luci-base: switch to ubus uci operations)
A quick scan of the current repo indicates that these are the only sites
of wrong call pattern
Fixesopenwrt/packages#6113
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
I've tried to get the lxc app in a more usable state. Tested with mips
and amd64 targets.
* check /etc/config/lxc in controller, not in cbi
* more controller cleanups
* remove unused 'fork_exec' function
* check path before container creation
* check space requirements before container creation
* support new uci options 'min_space' and 'min_temp',
default for both is 100000 KB
* both options are configurable via LuCI CBI template
* write messages to log in case of an error
* validate the container name during creation,
automatically remove invalid chars
* inform the user that only a stopped container can be destroyed
* add experimental ssl support (untested, disabled by default)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Expose options related to routing/NAT flow offloading
feature in firewall3. Offloading is available in kernel 4.14+
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
I've tried to get the lxc app in a more usable state. Tested with mips
and amd64 targets.
* fix missing tar/xz dependency,
only if LXC_BUSYBOX_OPTIONS is not selected
* mute needless gpg validation warning
* tidy up controller a little bit
* fix multiple possible dispatcher errors
* fix compatibility with XHTML standard theme (looks still horrible ;-)
* inform the user about custom kernel prerequisites
* inform the user about the template download
* inform the user if no template was found
Signed-off-by: Dirk Brenken <dev@brenken.org>
Change default leasefile hint from /var/log/upnp.leases to
/var/run/miniupnpd.leases
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
If the physical device is not set in the diag_command then the ping will
always use the route with the lowest metric from the default routing
table.
To fix this add the physical device of the logical interface to the ping
command.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
If a logical interface setup and adds in the protocol handler a dynamic
interface then the gateway is configured in the dynamic interface and the
setting up logical interface does not have a gateway specified.
To fix this check first if a dynamic interface is present and use this
gateway ip if found and if no dynamich interface is set then check for a
gateway in the logical interface.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
* Remove SimpleForm stuff from Interface Wizard
* adapt Travelmate to support new cbi apply workflow
* fix station re-odering
* tested successfully with old & new workflow
Signed-off-by: Dirk Brenken <dev@brenken.org>
Some of the options in the tabs were not placed in
optimal groups. Add tabs for DHCP and start triggers.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
This fixes an inconsistency because on the interface configuration if
you press Save&Apply it will go back to overview page. It is also the
case with "Firewall - Traffic Rules" details. On firewall zone it only
goes back to firewall zone-detail. Same behaviour on all pages is a good
user experience.
Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Switch to rpcd based uci apply/rollback workflow which helps to avoid soft-
bricking devices by requiring an explicit confirmation call after config
apply.
When a user now clicks "Save & Apply", LuCI first issues a call to uci apply
which commits and reloads configuration, then goes into a polling countdown
mode where it repeatedly attempts to call uci confirm.
If the committed configuration is sane, the confirm call will go through and
cancel rpcd's pending rollback timer.
If the configuration change leads to a loss of connectivity (e.g. due to bad
firewall rules or similar), the rollback mechanism will kick in after the
timeout and revert configuration files and pending changes to the pre-apply
state.
In order to cover such rare cases where a lost of connectivity is expected
and desired, the user is offered an "unchecked" apply option after timing
out, which allows committing and applying the changes anyway, without the
extra safety checks.
As a consequence of this change, the luci-reload mechanism is now completely
unsused since rpcd uses ubus config reload signals to reload affected
services, which means that only procd-enabled services will receive proper
reload treatment with the new workflow.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
1) Modify dependencies
Add dependencies required for to be able use containers created from
"images.linuxcontainers.org". Several of them require "lxc-attach" for set
password so to be able login. None of them has SSH preinstalled so
"lxc-console" is required to be able login and install SSH, for example.
Remove dependency "xz", it seems incompatible with LXC_BUSYBOX_OPTIONS when
both are enabled happens a build crash.
2) Change container image repository
The repository "virtualwrt.org/containers/" seems to not work, I have change
it by the official LXC container image repository.
3) Translate the arch
Translate the local uname architecture to a valid "images.linuxcontainers.org"
arch. Only tested with the platform "mvebu" (armv7l -> armhf).
4) Other minor fixes
Use same server to list images and download the image.
Disable GPG check when listing images.
Reported-by: "Admin Localnet <localnet@users.noreply.github.com>"
[Squashed commits, cleaned up whitespace, refactor arch mapping, escape url
setting, use system wide ubus helper, use uci model library]
Closes: #1422
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Also adjust the dependencies of components depending on these classes and
flatten the namespace from luci.http.protocol.* to luci.http.*
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
There is no direct user of the libuci-lua api, just some commented out code.
Rewrite the commented code to use the Map's uci cursor and remove the
explicit require.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* b00b676 fixed the cbi initialization for SimpleForm, therefore bring
back "Ignore BSSID" flag with dependent input field
Signed-off-by: Dirk Brenken <dev@brenken.org>
Explicitely require libuci-lua in model classes that use legacy /var/state
cursor handling.
Also add a specific dependency on libuci-lua to the luci-app-mwan3
Makefile in preparation of the upcoming default removal of libuci-lua.
Finally fix the post data dispatching on the notification tab, see #1722
for reference.
Fixes#1726.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Invoke the SimpleForm models using the form() action, not the cbi() ones.
This avoids the extraneous rendering of the cbi header template, avoiding
rejected save operations due to duplicated token value.
Fixes#1722.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
On the material theme the "Collecting data" hint in the status pages
was still present on the page even though the command was sucessfull executed.
Remove the legend tag and move the info "Collecting data" to the
"diag-rc-output" tag will solve this issue.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
* made the "ignore bssid" flag conditional to ease connection
to hidden networks:
* default for hidden networks "disabled"
* default for all others "enabled"
Signed-off-by: Dirk Brenken <dev@brenken.org>
Installing luci-app-wireguard should also install luci-proto-wireguard, to have it as an protocol for interface setup.
Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
* made qrencode support optional (remove hardcoded dependency)
* add a conditional QR Code button on overview page,
remove separate "QR Codes" tab
* move trigger timeout setting to extra section
Signed-off-by: Dirk Brenken <dev@brenken.org>
Use the new luci.ip MAC address facilities to parse and verify MAC addresses
in a common way, instead of relying on various ad-hoc solutions.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* forthcoming qrencode version will remove the short option "-I"
for inline, to get prepared switch to normal qrencode
command line parameters.
Signed-off-by: Dirk Brenken <dev@brenken.org>
when installing the luci app and opening it for the first time the
webinterface shows an error as some freshly installed rpcd calls are not
yet available. The reload fixes the problem.
luci-app-attendedsysupgrade: downloadable image
the creted sysupgrade image can now easily be downloaded via web
interface.
also fixed some </br> to <br />
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
Reads the header X-Unknown-Package offered by the sysupgrade server and
shows it in the error message.
Signed-off-by: Paul Spooren <spooren@informatik.uni-leipzig.de>
* remove unofficial 'WPA2' enc. token for better compatibility with
certain QR code reader, still 'WPA', 'WEP' and 'nopass' are supported
* add WEP key slot support (not really needed, but it's still
supported by LuCI wireless)
* correct escape single quotes and other special chars
in SSID & passwords
* code cleanup
Signed-off-by: Dirk Brenken <dev@brenken.org>
Some graph definitions rely on data not supported across all APC UPSes.
Due to recent upstream changes in collectd, the daemon no longer creates
a NaN-filled .rrd file corresponding to any missing UPS data. Depending
on the connected UPS, this may result in some "broken" graphs on the Luci
Statistics page since rrdtool cannot find the expected .rrd file.
Include the add_supported() function to determine the UPS data available
at runtime and update any definitions of graphs to include only supported
data. For example, the whole chart stack of AC input and output voltages
will normally be "broken" if the UPS only measures AC input voltage. With
these changes, the output voltage graph definition is stripped out,
allowing the chart to render.
Make consistent use of data types and instances in graph definitions. All
definitions now use the same format with the 'instances' key. Unnecessary
'types' and 'sources' keys are removed.
Fix the definition of 'line frequency' graph, based on upstream collectd
apcups plugin code: type is 'frequency' but instance should be 'input'.
This also includes some code and whitespace cleanup.
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
XHTML markup of "&" in the description about "download queue" was fixed
in 71230d2. Since UI text of it no longer matches msgid, I fixed it.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Change the preselection for the src zone to wan and the dest zon to lan
because this is the normal situation.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
* add an option for the captive portal detection
* support the new signal quality treshold (default 30)
* small fixes
Signed-off-by: Dirk Brenken <dev@brenken.org>
* Support new 'Download Queue'
* Support new 'Jail' Blocklist Creation
(replace former 'Whitelist Mode')
* Fix field width in "Runtime Information" section
Signed-off-by: Dirk Brenken <dev@brenken.org>
Read registered IP from file, updated by ddns-scripts.
Only read from DNS if file does not exist or outdated (check_interval).
Require ddns-scripts v 2.7.7
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Remove luci-app-voice-core and luci-app-voice-diag as they have been BROKEN
since 2015. They only support luci-app-diag-devinfo that has been removed.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Remove freifunk-p2pblock and luci-app-p2pblock as they have been BROKEN
since 2016. Packages depend on the removed l7-protocols as well as the
deprecated l7 support in the iptables kernel modules.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Remove luci-app-diag-devinfo as it has been BROKEN since 2015 due to
several dependencies to packages in oldpackages or abandoned
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
luci-app-radvd has been BROKEN since March 2016 as it depends
on radvd, which is still in oldpackages repo.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Remove the luci-app-pbx(-voicemail) packages, as they have been
marked BROKEN since August 2016.
The pbx packages depend on asterisk 1.8 that is EOL upstream
and has been moved from the telephony feed to the abandoned feed.
If LuCI pbx packages are still needed, they should be refreshed
to depend on a current asterisk version from the telephony feed,
and to match the features of that asterisk version.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
- memberconfg view: remove interface table information it is already reflected
in the interface dropdown
- policyconfig view: remove member table information it is already refelected
in the member dropdown
- ruleconfig view: remove policy table information it is already reflected
in the policy dropdown
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
