Commit Graph
100 Commits
Author SHA1 Message Date
Jo-Philipp Wich fbfa62627f luci-base: switch to luci-lib-jsonc
Add dependency on luci-lib-jsonc and use it to
reimplement luci.util.serialize_json().

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-21 00:29:55 +01:00
Jo-Philipp Wich 9b5046259f luci-mod-admin-full: make mirror port settings depend on mirror enable
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-20 23:44:55 +01:00
Jo-Philipp Wich f16405df91 luci-mod-admin-full: revert accidential button type change in 20fdac1ac4
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-19 10:02:41 +01:00
Jo-Philipp Wich 20fdac1ac4 luci-mod-admin-full: allow empty mac in interface status
Also adjust for changed IP address format emitted by iface_status call.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-17 17:42:22 +01:00
Jo-Philipp Wich 152ba9ab22 luci-mod-admin-full: use :ipaddrs() and :ip6addrs() helper for iface_status
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-17 17:36:00 +01:00
Jo-Philipp Wich e626599c26 luci-base: eliminate use of uci state vars in luci.model.network
Also implement :ipaddrs() and :ip6addrs() helper for network instances.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-17 17:35:02 +01:00
Jo-Philipp Wich 9b176c8d7b luci-mod-admin-full: prevent submit with interface delete button (#549)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-16 14:30:13 +01:00
Jo-Philipp Wich 092d2143bd luci-base: fix uci documentation issue (#538)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-16 12:37:23 +01:00
Jo-Philipp Wich 1cb3adb619 Merge pull request #396 from fanthos/master
luci-app-qos: Add custom QOS classes to luci dropdown list
2015-11-11 10:15:33 +01:00
Jo-Philipp Wich 2258d3de25 Merge pull request #535 from saik0/redirect-root-if-empty-signed
Redirect to root on empty path (signed off)
2015-11-11 10:14:34 +01:00
Jo-Philipp Wich 927dc1aff9 luci-base: eliminiate use of uci state vars in luci.sys
Rewrite `luci.sys.wifi.getiwinfo()` to use the ubus wireless state instead of
depreacated uci state vars in order to map abstract network notation to
wireless ifnames.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-27 14:13:05 +01:00
Jo-Philipp Wich 57ba1922b7 Add link to API reference 2015-10-27 13:24:09 +01:00
Jo-Philipp Wich 6d368a4033 Move libubus-lua dependency to luci-base
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-27 13:09:21 +01:00
Jo-Philipp Wich f9e590aa47 luci-theme-material: do not infer login state from url (#520)
Checking for `;` in the url is no good indicator whether a user is logged in,
instead query the dispatcher and set a `logged-in` CSS class on the `<body>`
element if a session exists.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-22 21:08:22 +02:00
Jo-Philipp Wich 6c4341ee01 luci-mod-admin-full: fix invalid markup in packages.htm (#518)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-22 12:20:20 +02:00
Jo-Philipp Wich 94ab57f48c luci-mod-admin-full: restructure and fix backup, restore and sysuprade (#517)
Do not use standard post security checking for actions that require file upload
since reading the token value will trigger parsing of the http message body
before the file upload handler has been set, which causes LuCI to buffer the
entire request body in memory.

In order to simplify the code and logic flow, split action_flashops() into
separate handlers for reset, backup, restore and sysupgrade.

Let the backup restore and sysupgrade handlers use the new test_post_security()
method in luci.dispatcher to perform token checking *after* setting the upload
handler.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-22 08:48:06 +02:00
Jo-Philipp Wich d32c685039 luci-base: dispatcher expose test_post_security()
Allows external code to perform POST and token checking manually.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-22 08:30:29 +02:00
Jo-Philipp Wich 79383f5a74 luci-base: ensure that base url is emitted with trailing slash
Now that we don't have an url token anymore, '/cgi-bin/luci' becomes a valid
url while cookies are restricted to only '/cgi-bin/luci/' and below.

In order to ensure that the first request after login refers to a path
covered by the authentication cookie, change build_url() to always append
a trailing slash if we're referring to the base url.

This should fix the login problems mentioned in #516.

While we're touching the dispatcher, also remove remaining url token code.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-21 16:48:25 +02:00
Jo-Philipp Wich b4d62d3fd7 luci-mod-admin-full: do not access dispatcher.context.urltoken in logout
The urltoken table is going to be removed.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-21 16:43:07 +02:00
Jo-Philipp Wich 86326e0def luci-base: remove security token from urls
Now that sensitive urls require post requests and only accept them if a valid
security token is sent along the request, we can drop the global random url
token to improve LuCI usability.

The main improvement is the ability to use multiple tabs with the same login
session, but also deep linking to specific urls without the need for another
login becomes feasible, e.g. for documentation purposes.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-21 00:31:27 +02:00
Jo-Philipp Wich f23f7b8751 luci-app-upnp: protect lease delete call with csrf token
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-21 00:11:28 +02:00
Jo-Philipp Wich c1278f967e luci-app-splash: protect admin status call with csrf token
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-21 00:09:55 +02:00
Jo-Philipp Wich ac34dfa0bc luci-app-radicale: protect start/stop actions with csrf token
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-21 00:03:56 +02:00
Jo-Philipp Wich ae9fb03e74 luci-app-privoxy: protect start/stop actions with csrf token
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-21 00:03:03 +02:00
Jo-Philipp Wich 0f1f5140e3 luci-app-ocserv: protect disconnect action with csrf token
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-21 00:00:55 +02:00
Jo-Philipp Wich b9ed03c5a9 luci-app-ddns: protect start/stop actions with csrf token
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-20 23:58:01 +02:00
Jo-Philipp Wich d4666757b7 luci-mod-admin-full: protect iptables counter reset and restart with token
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-20 22:27:39 +02:00
Jo-Philipp Wich 8bb749ecc3 luci-mod-admin-full: protect network post actions with csrf tokens
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-20 22:17:23 +02:00
Jo-Philipp Wich 6b3f804956 luci-base: filter invalid opkg status lines
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-20 21:04:46 +02:00
Jo-Philipp Wich b5826f1ffb luci-mod-admin-full: protect clock, flash and opkg ops with submit token
* Use post_on() target to require csrf token verification for modifying actions
* Ensure that package and flash operation handlers guard modifying operations
  with parameter check

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-20 21:04:46 +02:00
Jo-Philipp Wich 562c47e5fd luci-base: generalize post security token handling
* Add a generic helper function to check need for post / csrf token validation
* Remove custom token verification in cbi targets
* Support requiring post security depending on specific submit parameters,
  usable through post_on() action

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-20 21:04:46 +02:00
Jo-Philipp Wich d1da53512e luci-app-ddns: fix typo in previous commit
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-12 11:14:01 +02:00
Jo-Philipp Wich 49a7c5bd03 luci-app-ddns: remove title <a> hacks
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-12 09:14:49 +02:00
Jo-Philipp Wich 222284578b Merge pull request #505 from roger-/dump1090-latlon
dump1090: lat/lon should be floats
2015-10-08 02:06:08 +02:00
Jo-Philipp Wich bd504f552d luci-base: prevent UCI changes in CBI if form is not in submit state
Only process submitted data if the "cbi.submit" parameter is present as the
dispatcher will verify the integrity of the CSRF token in this case.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-08 00:30:14 +02:00
Jo-Philipp Wich 281d2f6178 Globally replace luci.dispatcher.build_url(...) with url(...) invocations
Also concat multiple string arguments into one while we're at it.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-07 19:07:36 +02:00
Jo-Philipp Wich 49a2cb5ad1 luci-base: expose luci.dispatcher.build_url() as url() in templates
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-07 13:03:42 +02:00
Jo-Philipp Wich 3f29078fb9 luci-base: protect simpleforms with CSRF tokens
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-07 12:24:58 +02:00
Jo-Philipp Wich 38a9993bd1 luci-mod-admin-full: switch to POST action for reboot
Also rework the reboot tmeplate a little bit.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-07 01:54:56 +02:00
Jo-Philipp Wich ada4a0ea98 luci-base: switch to POST action for service reload
Switches the service reload calls to CSRF token protected POST action.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-06 22:37:27 +02:00
Jo-Philipp Wich e440144d56 luci-mod-admin-full: switch to POST actions for UCI changes
Switches UCI apply/revert/save to CSRF token protected POST actions.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-06 22:29:07 +02:00
Jo-Philipp Wich 9b75d8ec36 luci-theme-bootstrap: add redir parameter to uci change menu
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-06 22:21:48 +02:00
Jo-Philipp Wich 36f133f946 luci-theme-material: add redir parameter to uci change menu
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-06 22:21:36 +02:00
Jo-Philipp Wich 8d46c20327 luci-base: protect CBI forms with CSRF tokens
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-06 18:54:35 +02:00
Jo-Philipp Wich 5a6382171d luci-base: add support for POST-only actions with CSRF token check
Add the dispatcher infrastructure to restrict certain routes to POST
requests only in conjunction with verification of CSRF tokens.

This is the first step to get rid of the CSRF token in the url in favor
to tokens embedded in forms.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-06 15:56:35 +02:00
Jo-Philipp Wich 5e9da8240f Globally convert headline anchors into name attributes.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-06 13:30:33 +02:00
Jo-Philipp Wich 8023fb9c43 Merge pull request #501 from LuttyYang/master
luci-theme-material: PR from version 0.2.6
2015-10-05 20:29:41 +02:00
Jo-Philipp Wich 78c61d6de0 luci-app-statistics: reorder interface, netlink and openvpn datasources
This aligns the order and grouping of RX and TX network datasources.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-05 19:11:51 +02:00
Jo-Philipp Wich c8c4a343c2 luci-app-statistics: add support for sorting RRD data sources
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-05 19:11:13 +02:00
Jo-Philipp Wich 3289e13495 luci-app-statistics: add initial support for collectd-mod-openvpn
This changeset covers compression and traffic stats, not every combination has
been tested yet.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-05 18:55:28 +02:00
Jo-Philipp Wich cff2b99b4f luci-app-statistics: add initial support for collect-mod-sensors
Due to a lack of a test environment this support only covers thermal graphs
so far. Please send the output of "rrdtool info /tmp/rrd/*/sensors-*/*.rrd"
if your system happens to support voltage, power or fanspeed sensors.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-05 15:13:44 +02:00
Jo-Philipp Wich 03a90f161a luci-mod-admin-full: status: survive broken DSL status output
Only attempt to call "dsl_func" if the dsl_control lucistat output could be
successfully evaluated.

Works around https://dev.openwrt.org/ticket/20607

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-03 16:11:14 +02:00
Jo-Philipp Wich c10a7380bf luci-app-statistics: improve diagram generation, add missing title
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-03 15:30:59 +02:00
Jo-Philipp Wich 96b031bbad luci-app-statistics: rework graph label handling
Remove leftover unused translation code and properly escape colons in line
labels.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-03 15:29:28 +02:00
Jo-Philipp Wich 59d2f60a42 luci-app-statistics: only render index view for more than one instance
If a plugin produces only one instance, e.g. netlink with just one interface
configured, then the controller will register no detail views which would
normally show all graphs but the index pacage of a given plugin will still
display the collapsed view without any possibility to reach the full listing.

Fix the problem by only rendering a linked index view when more than one
instance is present.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-03 11:40:12 +02:00
Jo-Philipp Wich a60184d6bd Merge pull request #485 from dwmw2/master
luci/statistics: Fix nut UPS graphs
2015-09-22 22:18:16 +02:00
Jo-Philipp Wich 5735cdee86 contrib: remove obsolete luasrcdiet packaging, its built as part of luci-base now
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02 09:46:05 +02:00
Jo-Philipp Wich ac65bb291a contrib: remove obsolete uhttpd packaging
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02 09:41:35 +02:00
Jo-Philipp Wich 62b203d0ea contrib: remove obsolete host uci configurations
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02 09:41:14 +02:00
Jo-Philipp Wich 16b63cb471 Remove obsolete toplevel Makefile
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02 09:39:24 +02:00
Jo-Philipp Wich 6c72dec7e5 build/makedocs.sh: handle relative output directories
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02 09:39:24 +02:00
Jo-Philipp Wich daeb2016d6 luci-lib-ip: fix documentation issue
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01 16:49:19 +02:00
Jo-Philipp Wich 3d0e8deede Regenerate api documentation
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01 16:44:59 +02:00
Jo-Philipp Wich 00e2b03927 Move doc/ to documentation/api/
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01 16:44:03 +02:00
Jo-Philipp Wich ed1a641696 Fix module lines in several luadoc files
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01 16:43:19 +02:00
Jo-Philipp Wich 2e61188881 Add generated documentation to repository
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01 12:19:44 +02:00
Jo-Philipp Wich fdb7daa907 Merge pull request #460 from jplitza/master
luci-lib-jsonc: Fix memory leak in stringify()
2015-09-01 09:34:14 +02:00
Jo-Philipp Wich a36a73cbdc Merge pull request #457 from jplitza/master
luci-lib-jsonc: fix handling of strange keys, allow encoding []
2015-08-30 17:57:00 +02:00
Jo-Philipp Wich 0ecd6974a8 Merge pull request #454 from hnyman/fix-entropy
statistics: entropy plugin - fix placement of entropy.lua
2015-08-28 12:06:25 +02:00
Jo-Philipp Wich 8597b86ebf Merge pull request #444 from hnyman/fixconntrack
statistics: fix conntrack and ping regression caused by collectd changes
2015-08-19 10:08:42 +02:00
Jo-Philipp Wich 376f038726 luci-lib-nixio: pass exact sockaddr length to getnameinfo()
Musl libc requires the length parameter of getnameinfo() to be exactly
`sizeof(struct sockaddr_in)` or `sizeof(struct sockaddr_in6)`, depending on
the passed sockaddr family.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-07-30 22:38:36 +02:00
Jo-Philipp Wich 3610f3222d luci-mod-rpc: move luci config require into the authentication function (#427)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-07-15 23:28:16 +02:00
Jo-Philipp Wich 16047d03c5 luci-mod-rpc: add missing luci config require
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-07-15 22:30:45 +02:00
Jo-Philipp Wich 74b5c1bbc3 luci-mod-admin-full: restart the firewall instead of reloading it
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-07-03 16:59:51 +02:00
Jo-Philipp Wich 0ef5f3c693 contrib/firefunk-watchdog: fix build against musl
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-06-25 14:19:51 +02:00
Jo-Philipp Wich 23dba10808 Merge pull request #424 from kdarbyshirebryant/master
luci-app-upnp: Stop sys upgrade disabling miniupnpd service on first boot after upgrade
2015-06-24 12:16:23 +02:00
Jo-Philipp Wich eac90c78fb Merge pull request #419 from dangowrt/fix-olsr-json-dependency
luci-app-olsr: depend on luci-lib-json
2015-06-16 18:27:09 +02:00
Jo-Philipp Wich e8029d6398 Fix markup in Template reference 2015-06-16 10:21:47 +02:00
Jo-Philipp Wich dde25048b9 Fix links in ThemesHowTo.md 2015-06-16 10:17:28 +02:00
Jo-Philipp Wich 4b11843e4c Add documentation converted from old Trac wiki pages
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-06-16 10:11:45 +02:00
Jo-Philipp Wich 37a9d6aee7 Merge pull request #414 from maz-1/mjpg-update
add chinese translations for luci-app-mjpg-streamer
2015-06-16 09:56:30 +02:00
Jo-Philipp Wich edf0f4f549 Merge pull request #402 from NeoRaider/json-empty-object
luci-lib-json: ignore null keys to allow encoding empty objects
2015-06-10 10:20:49 +02:00
Jo-Philipp Wich d2638a7a0e Merge pull request #389 from hnyman/timezone2015d
Timezone information is updated to 2015d, released on 24 Apr 2015.
2015-06-10 10:19:19 +02:00
Jo-Philipp Wich abc1ed6148 Merge pull request #403 from hnyman/fix-qos-l7
luci-app-qos: remove l7 options
2015-06-07 17:13:48 +02:00
Jo-Philipp Wich 1dada8cc44 luci-base: prevent parsing the form input after cbi emergency save
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26 17:32:11 +02:00
Jo-Philipp Wich d6d0926aee Merge pull request #388 from oneru/fwknop-qr
Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in th…
2015-05-26 17:14:24 +02:00
Jo-Philipp Wich fe14cd5a66 luci-base: fallback to a simple text editor if uci config cannot be loaded
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26 17:12:42 +02:00
Jo-Philipp Wich 03610cee3a luci-base: rename .gitignore to .placeholder
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26 16:27:05 +02:00
Jo-Philipp Wich 64b728a2df Merge pull request #384 from nightcoffee/nightcoffee-patch-1
luci-base: Add cache control in index.html
2015-05-21 14:51:30 +02:00
Jo-Philipp Wich ec48d2d01f Merge pull request #385 from oneru/fwknop-qr
luci-app-fwknopd: Add qr code support
2015-05-20 20:26:59 +02:00
Jo-Philipp Wich a7083780de collections/luci: depend on luci-proto-ipv6 if IPV6 is enabled
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-06 16:00:33 +02:00
Jo-Philipp Wich 6fb24acb38 Merge pull request #331 from poranje/proto=ipv6+aiccu+fixes
luci-proto-ipv6: fix aiccu requiretls
2015-05-06 15:42:53 +02:00
Jo-Philipp Wich c38b4cdffa luci.mk: don't builtin translations selected by CONFIG_ALL
Make sure that translation packages enabled through CONFIG_ALL
that depend on builtin packages are restricted to modules.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-05 10:32:15 +02:00
Jo-Philipp Wich 36879e9e86 Merge pull request #374 from wongsyrone/patch-1
luci-app-ddns: fix Simplified Chinese translations
2015-04-28 15:56:15 +02:00
Jo-Philipp Wich 58a42eaf9b Merge pull request #358 from freifunk-leipzig/master
luci-mod-admin-full: change adress to an ipv6-enabled host
2015-04-27 15:09:17 +02:00
Jo-Philipp Wich 70ffeb36db Merge pull request #370 from 981213/pull_request
Fix some Simplified Chinese translations in luci.
2015-04-27 15:08:21 +02:00
Jo-Philipp Wich 2243a3f937 Merge pull request #371 from aidvu/fstab-swap
luci-mod-admin-full: mount points SWAP fix
2015-04-27 15:06:42 +02:00
Jo-Philipp Wich 6a13d73c29 Synchronize translations
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:35:08 +02:00
Jo-Philipp Wich 5fd8761583 build: rework i18n-sync.sh to support new structure
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:17:23 +02:00
Jo-Philipp Wich 661c33ba91 luci-app-ahcp: remove leftover po templates
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:08:23 +02:00