summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2018-05-19luci-base: handle potential crash in luci.model.network.interface.get_i18n()Jo-Philipp Wich
Should prevent the crash mentioned in #1779. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-19luci-base: break circular luci.config <> luci.model.uci dependencyJo-Philipp Wich
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-18Merge pull request #1801 from dibdot/adblockDirk Brenken
luci-app-adblock: respect SimpleForm size limit
2018-05-18luci-app-adblock: respect SimpleForm size limitDirk Brenken
* respect SimpleForm size limit of 100KB for advanced online editing Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-18luci-lib-json: support serializing userdataJo-Philipp Wich
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-18luci-mod-rpc: fix unresolved controller reference in rpc_auth()Jo-Philipp Wich
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-18Merge pull request #1769 from jow-/masterJo-Philipp Wich
UCI apply/rollback workflow
2018-05-18luci-base: raise maximum POST value size to 100KBJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-18lucihttp: update to latest HEADJo-Philipp Wich
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-18Merge pull request #1748 from hnyman/wifidataHannu Nyman
luci-base: show wifi chip identification on overview
2018-05-16Merge pull request #1793 from TDT-AG/pr/20180514-luci-app-ddns-fix-outputHannu Nyman
luci-app-ddns: fix HTML page rendering in globals section
2018-05-16luci-app-ddns: fix HTML page rendering in globals sectionHelge Mader
Signed-off-by: Helge Mader <ma@dev.tdt.de>
2018-05-15Merge pull request #1797 from Rixerx/masterHannu Nyman
luci-base: update Polish translation
2018-05-15Merge pull request #1796 from TDT-AG/pr/20180515-luci-app-mwan3-add-paramHannu Nyman
luci-app-mwan3: add new config options and fix
2018-05-15luci-base: update Polish translationRixerx
Signed-off-by: Rixerx <krystian.kozak20@gmail.com>
2018-05-15luci-app-mwan3: add quality check optionsFlorian Eckert
Add new quality_check feature Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-05-15luci-app-mwan3: add dependecy to size optionFlorian Eckert
This option is only valid if track-method is set to "ping". Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-05-15Merge pull request #1794 from dibdot/adblockDirk Brenken
luci-app-adblock: sync with adblock 3.5.2
2018-05-15luci-app-adblock: sync with adblock 3.5.2Dirk Brenken
* 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-13luci-base: harden cookie sysauth=Yousong Zhou
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-12Merge pull request #1786 from musashino205/l10n/pagekite-add-jaDirk Brenken
luci-app-pagekitec: add Japanese translation
2018-05-11Merge pull request #1787 from TDT-AG/pr/20180509-net-mwan3-fixesDirk Brenken
luci-app-mwan3: fixes
2018-05-11Merge pull request #1791 from dibdot/travelmateDirk Brenken
luci-app-travelmate: fix Interface Wizard
2018-05-11luci-app-travelmate: fix Interface WizardDirk Brenken
* make sure to update the nw & fw entries only once Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-09Merge pull request #1789 from ldir-EDB0/miniupdpdtweakHannu Nyman
luci-app-upnp: change leasefile location hint
2018-05-09luci-app-upnp: change leasefile location hintKevin Darbyshire-Bryant
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-09luci-app-mwan3: pin diag ping command to interface deviceFlorian Eckert
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-09luci-app-mwan3: honor dynamic interface to get gateway ipFlorian Eckert
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-09Merge pull request #1780 from dibdot/adblockDirk Brenken
luci-app-adblock: support new workflow
2018-05-09luci-app-adblock: support new workflowDirk Brenken
* 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-09Merge pull request #1777 from dibdot/travelmateDirk Brenken
luci-app-travelmate: support new workflow
2018-05-09Merge pull request #1785 from EricLuehrsen/unbound_luciDirk Brenken
luci-app-unbound: clean up tab presentation
2018-05-09luci-app-travelmate: support new workflow & re-ordering fixDirk Brenken
* 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-09luci-app-pagekitec: add Japanese translationINAGAKI Hiroshi
Added Japanese translations. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-05-08luci-app-unbound: clean up tab presentationEric Luehrsen
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-07luci-app-commands: fix link generationYousong Zhou
Fixes openwrt/luci##824 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-07luci-mod-freifunk: fix redirect urlYousong Zhou
location.hostname lacks port info Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-07luci-app-firewall: redirect to overview page on zone details saveFlorian Eckert
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-07luci-mod-admin-full: use fs.glob instead nixio.fs.globYousong Zhou
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-07luci-mod-admin-full: no menu entry for leds if "/sys/class/leds" is emptyFlorian Eckert
Signed-off-by: Florian Eckert <fe@dev.tdt.de> Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-07luci-mod-admin-full: change supports_reset() test for factory resetFlorian Eckert
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-07luci-app-openvpn: add license tagFlorian Eckert
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-07luci-base: reload log on uci system changeFlorian Eckert
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-07luci-proto-ppp: add translation to ipv6 handlingFlorian Eckert
If there is no translation set, then on material theme the dropdown selection displaced. To fix this add an translation to this dropdown. The commit also changes source code whitespace shifting. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-05-07luci-base: fix i18n de typo for rc.localFlorian Eckert
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-05-05luci-base: add transitional /etc/init.d/ucitrackJo-Philipp Wich
Ship an /etc/init.d/ucitrack for spawning a virtual service with the sole purpose to track the configurations and dependencies formerly handled by luci-reload. Once all LuCI supported services ship with procd compatible init scripts, the uci track support can be dropped. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-05luci-mod-admin-full: rework wifi configurationJo-Philipp Wich
- localize variables - get rid of redirects breaking apply workflow - auto-adjust unusable channels when switching country - use apply/rollback workflow when enabling/disabling networks Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-05treewide: rework uci apply workflowJo-Philipp Wich
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>
2018-05-05luci-base: enable uci session isolationJo-Philipp Wich
Switch to per-session save directories to decouple LuCI configuration changes from system wide ones. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-05luci-mod-rpc: more auth/login fixes, expose further librariesJo-Philipp Wich
The previous attempt to fix authentication broke login functionality so rework the code once again, this time with referencing helper functions directly via the controller scope. Furthermore, properly expose luci.sys.wifi.getiwinfo() and luci.ip. For getiwinfo(), the RPC wrapped function accepts one further optional parameter specifying the operation to invoke on the iwinfo instance. If no operation is specified, a summary object containing all info without country and scan list is returned. Example to obtain iwinfo summary object: curl --cookie sysauth=... \ --data '{"method": "wifi.getiwinfo", "params": ["wlan0"]}' \ "http://192.168.1.1/cgi-bin/luci/rpc/sys" Example to obtain iwinfo scan list: curl --cookie sysauth=... \ --data '{"method": "wifi.getiwinfo", "params": ["wlan0", "scanlist"]}' \ "http://192.168.1.1/cgi-bin/luci/rpc/sys" The exposed luci.ip class uses a similar approach to allow invoking instance methods on cidr objects. The new(), IPv4(), IPv6() and MAC() constructors accept two further optional arguments, with the first specifying the instance method to invoke and the second the value to pass to the instance method. Example to get list of IPv4 neighbours (ARP entries): curl --cookie sysauth=... \ --data '{"method": "neighbors", "params": [{"family": 4}]}' \ "http://192.168.1.1/cgi-bin/luci/rpc/ip" Example to add 100 hosts to a network address: curl --cookie sysauth=... \ --data '{"method": "IPv4", "params": ["192.168.0.1", "255.255.255.0", "add", 1000]}' \ "http://192.168.1.1/cgi-bin/luci/rpc/ip" Signed-off-by: Jo-Philipp Wich <jo@mein.io>