Commit graph

9537 commits

Author SHA1 Message Date
Dirk Brenken
2b43ebe92f luci-app-lxc: made container creation more reliable
* 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>
2018-06-03 22:30:59 +02:00
Dirk Brenken
babcc14c79 luci-app-lxc: bugfix
* fix remaining javascript errors in Chrome

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-06-01 18:33:05 +02:00
Dirk Brenken
d8f2f24a5b luci-app-lxc: fix "plain-vanilla" integration, part 3
* 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>
2018-05-31 07:28:51 +02:00
Dirk Brenken
d9b6c5dd78 luci-app-lxc: fix "plain-vanilla" integration, part 2
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>
2018-05-27 20:46:13 +02:00
Dirk Brenken
fa4dc6be91 luci-app-lxc: fix "plain-vanilla" integration
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>
2018-05-23 22:21:46 +02:00
Jo-Philipp Wich
37a4a1c070 luci-mod-admin-full: fix crash on wireless when no networks are declared
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-19 23:28:14 +02:00
Jo-Philipp Wich
fdbb417abe luci-mod-admin-full: do not override iface section in wireless cbi map
Do override the iface section id upon commit to avoid clobbering the resulting
configuration. The manual config sync is not needed anymore after switching
to uncached ubus uci operations.

Fixes #1770.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-19 23:26:34 +02:00
Jo-Philipp Wich
64da34b13c luci-base: handle potential crash in luci.model.network.interface.get_i18n()
Should prevent the crash mentioned in #1779.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-19 22:11:08 +02:00
Jo-Philipp Wich
9ed48ef2a6 luci-base: break circular luci.config <> luci.model.uci dependency
On certain environments, mainly with the embedded uhttpd interpreter, the
luci.config class cannot be loaded due to a circular dependency with the
luci.model.uci class.

Break up the dependency by deferring the loading of luci.config in
luci.model.uci until it is actually needed.

Fixes #1803, FS#1553.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-19 13:07:37 +02:00
Dirk Brenken
72fe5dd703
Merge pull request #1801 from dibdot/adblock
luci-app-adblock: respect SimpleForm size limit
2018-05-18 18:31:07 +02:00
Dirk Brenken
840f45ecc5 luci-app-adblock: respect SimpleForm size limit
* respect SimpleForm size limit of 100KB for advanced online editing

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-18 18:19:41 +02:00
Jo-Philipp Wich
09de5a74e1 luci-lib-json: support serializing userdata
Fixes the following error when attempting to serialize userdata objects:

    .../json.lua:81: attempt to call local 'parser' (a nil value)

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-18 16:59:16 +02:00
Jo-Philipp Wich
364c271a84 luci-mod-rpc: fix unresolved controller reference in rpc_auth()
Fixes the following error:

   .../rpc.lua:85: attempt to index global 'ctrl' (a nil value)

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-18 16:58:17 +02:00
Jo-Philipp Wich
828202ef52
Merge pull request #1769 from jow-/master
UCI apply/rollback workflow
2018-05-18 16:44:33 +02:00
Jo-Philipp Wich
80cb4fef8c luci-base: raise maximum POST value size to 100KB
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-18 16:43:29 +02:00
Jo-Philipp Wich
27b7e43180 lucihttp: update to latest HEAD
6ddea4c utils: fix crash with zero length input string in lh_header_attribute()
cb119de lib: add support for setting the maximum allowed data size

Fixes #1784.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-18 16:34:28 +02:00
Hannu Nyman
521554f4a7
Merge pull request #1748 from hnyman/wifidata
luci-base: show wifi chip identification on overview
2018-05-18 12:51:24 +03:00
Hannu Nyman
7b684361cc
Merge pull request #1793 from TDT-AG/pr/20180514-luci-app-ddns-fix-output
luci-app-ddns: fix HTML page rendering in globals section
2018-05-16 09:28:08 +03:00
Helge Mader
7a9957e727 luci-app-ddns: fix HTML page rendering in globals section
Signed-off-by: Helge Mader <ma@dev.tdt.de>
2018-05-16 06:45:04 +02:00
Hannu Nyman
47971d220e
Merge pull request #1797 from Rixerx/master
luci-base: update Polish translation
2018-05-15 18:15:32 +03:00
Hannu Nyman
452c161ac0
Merge pull request #1796 from TDT-AG/pr/20180515-luci-app-mwan3-add-param
luci-app-mwan3: add new config options and fix
2018-05-15 18:15:04 +03:00
Rixerx
3782e74cf8 luci-base: update Polish translation
Signed-off-by: Rixerx <krystian.kozak20@gmail.com>
2018-05-15 11:40:27 +02:00
Florian Eckert
9a93359d42 luci-app-mwan3: add quality check options
Add new quality_check feature

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-05-15 11:11:38 +02:00
Florian Eckert
2c6faaecd1 luci-app-mwan3: add dependecy to size option
This option is only valid if track-method is set to "ping".

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-05-15 11:11:34 +02:00
Dirk Brenken
f3b3051236
Merge pull request #1794 from dibdot/adblock
luci-app-adblock: sync with adblock 3.5.2
2018-05-15 08:07:10 +02:00
Dirk Brenken
55f251b01f luci-app-adblock: sync with adblock 3.5.2
* archive sub-categories (shalla & ut_capitole) are now configurable
  via LuCI CBI template
* small bugfixes & enhancements

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-15 08:00:02 +02:00
Yousong Zhou
2f0f456b71 luci-base: harden cookie sysauth=
A simple scan of the code indicates that currently no code in the repo
is accessing the sysauth= cookie

Closes openwrt/luci#1555

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-13 18:30:47 +08:00
Dirk Brenken
88a1f8f407
Merge pull request #1786 from musashino205/l10n/pagekite-add-ja
luci-app-pagekitec: add Japanese translation
2018-05-12 09:36:54 +02:00
Dirk Brenken
1e39fef147
Merge pull request #1787 from TDT-AG/pr/20180509-net-mwan3-fixes
luci-app-mwan3: fixes
2018-05-11 20:26:11 +02:00
Dirk Brenken
e951a4dd90
Merge pull request #1791 from dibdot/travelmate
luci-app-travelmate: fix Interface Wizard
2018-05-11 20:15:20 +02:00
Dirk Brenken
6e4d992710 luci-app-travelmate: fix Interface Wizard
* make sure to update the nw & fw entries only once

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-11 11:00:16 +02:00
Hannu Nyman
658b6d7d21
Merge pull request #1789 from ldir-EDB0/miniupdpdtweak
luci-app-upnp: change leasefile location hint
2018-05-09 22:11:48 +03:00
Kevin Darbyshire-Bryant
ea02940c0e luci-app-upnp: change leasefile location hint
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>
2018-05-09 20:05:44 +01:00
Florian Eckert
ee54a9542f luci-app-mwan3: pin diag ping command to interface device
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>
2018-05-09 14:20:03 +02:00
Florian Eckert
f50de41959 luci-app-mwan3: honor dynamic interface to get gateway ip
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>
2018-05-09 14:19:58 +02:00
Dirk Brenken
3b709d8cdf
Merge pull request #1780 from dibdot/adblock
luci-app-adblock: support new workflow
2018-05-09 13:38:09 +02:00
Dirk Brenken
3aae6ce82e luci-app-adblock: support new workflow
* adapt Adblock to support the new cbi apply workflow
* tested successfully with old & new workflow

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-09 13:35:49 +02:00
Dirk Brenken
ffb654310e
Merge pull request #1777 from dibdot/travelmate
luci-app-travelmate: support new workflow
2018-05-09 13:19:14 +02:00
Dirk Brenken
741327dfe2
Merge pull request #1785 from EricLuehrsen/unbound_luci
luci-app-unbound: clean up tab presentation
2018-05-09 13:18:13 +02:00
Dirk Brenken
e7edcb4057 luci-app-travelmate: support new workflow & re-ordering fix
* 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>
2018-05-09 13:13:33 +02:00
INAGAKI Hiroshi
71ffabc11c luci-app-pagekitec: add Japanese translation
Added Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-05-09 16:16:26 +09:00
Eric Luehrsen
1204d2a617 luci-app-unbound: clean up tab presentation
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>
2018-05-08 22:57:32 -04:00
Yousong Zhou
e4f77ace8b luci-app-commands: fix link generation
Fixes openwrt/luci##824

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-07 22:28:40 +08:00
Yousong Zhou
b810d99503 luci-mod-freifunk: fix redirect url
location.hostname lacks port info

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-07 22:27:58 +08:00
Florian Eckert
c1eba6a046 luci-app-firewall: redirect to overview page on zone details save
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>
2018-05-07 21:46:38 +08:00
Yousong Zhou
c91ba4babc luci-mod-admin-full: use fs.glob instead nixio.fs.glob
It's how the module was named when "require"d and used by other code in
the same function

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-07 21:19:35 +08:00
Florian Eckert
690ae5c211 luci-mod-admin-full: no menu entry for leds if "/sys/class/leds" is empty
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-07 21:14:48 +08:00
Florian Eckert
da4fab0462 luci-mod-admin-full: change supports_reset() test for factory reset
The check "supports_reset" only covers /proc/mtd partitions. If we have
this the commands checks for names like ubi or rootfs_data. If this is
found the system is possible for a factory reset.  But on x86 the
situation is different.  We have no /proc/mtd partitions because this
system do not use a bare metall flash.

To solve this issue check if we have an overlay and if so we could do a
factory reset. This could be applied for system which uses bare metal
flash and system which uses FTL or harddisks.

Jffs2reset is the current command used for factory reset.  It will try
to find volume "rootfs_data" and if it's mounted will delete all files
under directory /overlay

luci-mod-admin-mini also has check for reset available, but we leave it
alone for now as it uses "mtd -r erase rootfs_data"

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-07 20:36:40 +08:00
Florian Eckert
428eb63f0a luci-app-openvpn: add license tag
Add missing license tag.  File headers of the application indicate so

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-07 20:06:34 +08:00
Florian Eckert
6f3007980b luci-base: reload log on uci system change
If log configuration get changed in uci system no new values are applied
until reboot. Add /etc/init.d/log reload to exec option will solve this
issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-05-07 14:37:35 +08:00