Commit graph

8075 commits

Author SHA1 Message Date
Jo-Philipp Wich
d01c4c7ae6 Merge pull request #580 from Umeaboy/patch-3
luci-app-ahcp: Edited Swedish translation
2015-12-17 02:25:08 +01:00
Kristoffer Grundström
fd82daef1a luci-app-ahcp: Edited Swedish translation
Signed-off-by: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>
2015-12-17 02:24:00 +01:00
Daniel Dickinson
3f95160cbd protocols: vpnc: Add vpnc as a network protocol 2015-12-16 01:37:04 -05:00
Daniel Dickinson
c481f3f343 validation: Add option ipv4only option to host and hostport datatypes
Some applications only support ipv4 so add ipv4only option
to host and hostport datatypes so that for thos applications
that when an IP address is specified only and ipv4 ip address
gets accepted.
2015-12-15 20:41:01 -05:00
Daniel Dickinson
bbcfad7953 modules/luci-base: Fix ipaddrport validator to support ipv6
The previous versiono of ipaddrport validator only worked for ipv4
due to disallowing colons (:) in ip address which obvious fails for
ipv6.  We now instead allow either ipv4 address or an ipv6 address of
the form [<ipv6address>]:port
2015-12-15 20:40:14 -05:00
Daniel Dickinson
b475ec699d luci-base: Make default for FileUpload 'safe'
Some files and pointers to files are not safe to remove without a replacement
file and config pointing to the file.  For instance for uhttpd application in
the works, removing the certificate or key config or files without having the
replacements in places renders the WeUI inaccessible.

The only other place where FileUpload is currently used is for wifi certificates
for which the 'safe' handling is also preferred.  Therefore make the default for
the FileUpload widget the safe handling and add a property self.unsafeupload that
allows for the old unsafe handling should it prove useful in some case.

Also allow to specify a file already on router instead of uploading a file.

Signed-off By: Daniel Dickinson <openwrt@daniel.thecshore.com>
2015-12-15 20:36:17 -05:00
Jo-Philipp Wich
f25c4e07bc Merge pull request #564 from cshore/pull-request-app-firewall-timedate
Pull request app firewall timedate
2015-12-15 23:08:17 +01:00
Jo-Philipp Wich
19b85c34fc Merge pull request #562 from cshore/pull-request-upload-dir
modules/luci-base: Move LuCI FileUpload directory to /etc/luci-upload…
2015-12-15 22:56:47 +01:00
Daniel Dickinson
b130ca554f lib-nixio / luci-base: Fix for reading csrf token prevents file upload
The call to http.formvalue in order to read the csrf token causes
_parse_input to be triggered *before* controllers and cbi maps have
been built.  This results in the failure of file uploads because
the file handler is not yet in place when _parse_input gets called,
and it is in _parse_input that POST data is parsed (including files).

To fix this we add the ability to write file fields to temporary
files (using mkstemp and unlink in nixio.file) and use this to
store file data until the filehandler is registered, with a
fallback to reading the file data into memory.

Once the filehandler callback gets registered we iterate
though all previously parsed (saved) files and copy the
data to the file handler, and then close the temporary
file (which finally removes because we unlinked after
creating the file, but didn't close the file so unlink
was deferred).

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
2015-12-15 13:12:29 -05:00
Daniel Dickinson
0ec3f91a0c validation: Add option ipv4only option to host and hostport datatypes
Some applications only support ipv4 so add ipv4only option
to host and hostport datatypes so that for thos applications
that when an IP address is specified only and ipv4 ip address
gets accepted.
2015-12-15 13:12:10 -05:00
Daniel Dickinson
38880407aa modules/luci-base: Fix ipaddrport validator to support ipv6
The previous versiono of ipaddrport validator only worked for ipv4
due to disallowing colons (:) in ip address which obvious fails for
ipv6.  We now instead allow either ipv4 address or an ipv6 address of
the form [<ipv6address>]:port
2015-12-15 13:10:15 -05:00
Daniel Dickinson
d83642c205 applications: uhttpd: Add a uHTTPd configuration app
uHTTPd has a lot of useful options that ought to be configurable
without have to SSH in, so expose those options in a UI page.
2015-12-15 13:09:46 -05:00
Daniel Dickinson
6509e007e2 luci-base: Make default for FileUpload 'safe'
Some files and pointers to files are not safe to remove without a replacement
file and config pointing to the file.  For instance for uhttpd application in
the works, removing the certificate or key config or files without having the
replacements in places renders the WeUI inaccessible.

The only other place where FileUpload is currently used is for wifi certificates
for which the 'safe' handling is also preferred.  Therefore make the default for
the FileUpload widget the safe handling and add a property self.unsafeupload that
allows for the old unsafe handling should it prove useful in some case.

Also allow to specify a file already on router instead of uploading a file.

Signed-off By: Daniel Dickinson <openwrt@daniel.thecshore.com>
2015-12-15 13:09:41 -05:00
Hannu Nyman
ff2f536dd1 CONTRIBUTING.md: clarify signed-off-by advice
Clarify the signed-off-by advice in CONTRIBUTING.md.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-12-15 14:40:51 +02:00
Daniel Dickinson
986baa5cce applications: firewall: Add time and date for rules and redirects
UCI config for the firewall has the option of specifying time and date
limitations; add these options the UI.
2015-12-14 23:26:33 -05:00
Daniel Dickinson
6318f67fd4 luci-base: Add time and data datatypes for use with firewall app
Adding LuCI configuation of the firewall time and data uci options
is in progress and this adds the necessary datatypes for validating
those fields.
2015-12-14 23:26:26 -05:00
Daniel Dickinson
403b939acd modules/luci-base: Move LuCI FileUpload directory to /etc/luci-uploads and save across sysupgrade
/lib/uci/upload is a rather odd place for configuration files

Also the files were not saved across sysupgrade, which is somewhat
counter-productive for configuration files.

Signed-off By: Daniel Dickinson <openwrt@daniel.thecshore.com>
2015-12-12 22:45:29 -05:00
Jo-Philipp Wich
63155e9932 luci-app-olsr: use public interface of luci.model.network.wifinet (#569)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-12-09 16:51:48 +01:00
Jo-Philipp Wich
397294ab06 luci-base: rewrite luci.sys.net.conntrack()
The new function is twice as fast as the old implementation and properly
summarizes outgoing and incoming byte and packet counters.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-12-09 15:54:43 +01:00
Hannu Nyman
c18a0e447f Merge pull request #567 from inTagger/ip-addr-view-update
luci-mod-admin-full: update IPv4/IPv6 list views
2015-12-09 11:43:36 +02:00
Alexander Logger
f8d0ba00b2 luci-mod-admin-full: update IPv4/IPv6 list views
For better view of 'Interface Overview' IPv4/IPv6 addresses for
interfaces should be displayed as lists, but not as comma separated
strings.

Signed-off-by: Alexander Logger <intagger@gmail.com>
2015-12-08 21:20:11 +03:00
Hannu Nyman
bac5f2cebf i18n: sync translations
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-12-06 13:23:38 +02:00
Jo-Philipp Wich
3bae3c7f5e Merge pull request #461 from marcel-sch/patch-1
package/community-profiles: add freifunk cottbus profile
2015-12-04 20:04:55 +01:00
Jo-Philipp Wich
3a58ef46c2 Merge pull request #559 from Arnie97/add-openvpn-proto
luci-app-openvpn: Add udp6 and tcp6 to proto
2015-12-03 16:42:58 +01:00
Arnie97
7a43379196 luci-app-openvpn: Add udp6 and tcp6 to proto
Signed-off-by: Yifeng Zhang <arnie97@gmail.com>
2015-12-03 23:17:46 +08:00
Jo-Philipp Wich
e8465b3e4f Merge pull request #565 from yousong/l2tp-server
Allow host:port value for l2tp `server` option
2015-12-02 13:57:05 +01:00
Yousong Zhou
09768ed745 luci-proto-ppp: l2tp: allow specifying port in "server" option
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2015-12-02 20:56:11 +08:00
Yousong Zhou
862b84feb2 luci-base: fix escaping lua string to js repr
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2015-12-02 20:56:08 +08:00
Jo-Philipp Wich
9b30357454 luci-base: add hostport and ipaddrport validation types
Add two new types 'hostport' and 'ipaddrport' to validate strings in the form
'sub.example.org:1234' and '0.0.0.0:80'. The 'hostport' accepts hostnames or
IP addresses followed by a colon and a port number while the 'ipaddrport' type
accepts numeric IP addresses only, followed by a colon and a port.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-12-02 11:13:39 +01:00
Jo-Philipp Wich
ea9f25b63e Merge pull request #561 from cshore/pull-request-fstab-improvements
Pull request fstab improvements
2015-12-02 10:44:10 +01:00
Daniel Dickinson
829467b627 luci-base: Add function for shell single-quote parameter escaping
When using os.execute or luci.sys.call the shell is called with the
command line which means that standard shell interpretation of strings
occurs.  To allow to use these commands more easily we add functions
for properly escaping single-quoted strings used on the command line
2015-12-02 02:19:02 -05:00
Daniel Dickinson
1d5cab4ced luci-mod-admin-full: fstab: Add ability to redo the detection of block devices
Adds a button that does block detect and write the new configuration
to /etc/config/fstab.
2015-12-02 02:17:20 -05:00
Daniel Dickinson
89f74f77da luci-mod-admin-full: fstab: Add ability to set global options like anonymous mounts
Previously the global configuration options were missing the the LuCI configuration,
however these options are useful, so make them available to the UI.
2015-12-02 02:16:35 -05:00
Daniel Dickinson
031cab418c luci-mod-admin-full: Don't show jail bind mounts
The user is unlikely to care about the plethora of jail bind mounts
when using jails, so don't display them in this app.
2015-12-02 02:16:22 -05:00
Daniel Dickinson
b8c2d340f3 luci-mod-admin-full: fstab: Add ability to unmount non-system mounts
Add an unmount button for non-system mounts which will unmount
the corresponding file system.
2015-12-02 02:16:13 -05:00
Jo-Philipp Wich
9c9118566c luci-app-openvpn: add route_nopull (#560)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-30 07:58:34 +01:00
Jo-Philipp Wich
c123fa86b0 Merge pull request #534 from yousong/add-luci-proto-pppossh
Add luci proto pppossh
2015-11-26 23:23:15 +01:00
Jo-Philipp Wich
ce04adb383 luci-mod-admin-full: limit SSID to 32 characters (#558)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-26 12:30:53 +01:00
Jo-Philipp Wich
c478101ca4 luci-mod-admin-full: fix script regression after 152ba9ab22
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-21 13:53:43 +01:00
Jo-Philipp Wich
55f458326d luci-base: use board.json to infer switch netdev
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-11-21 00:31:06 +01:00
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
Hannu Nyman
6f49ab92e5 Merge pull request #554 from bittorf/better_neigh.sh
freifunk-common: neigh.sh - show hostnames
2015-11-20 22:01:27 +02:00
Bastian Bittorf
e0bcfe82fb freifunk-common: neigh.sh - show hostnames
if nameservice-plugin is configured, we read
in all locally known hostnames and show them
in the output:

root@stuttgarter-core:~# neigh.sh
Local          Remote         vTime  LQ       NLQ      Cost Host
10.230.105.241 10.230.105.246 138851 1.000000 1.000000 1024 stuttgarter-rhnk.olsr
10.230.105.241 10.230.105.247 135717 1.000000 1.000000 1024 stuttgarter-emma.olsr
10.230.105.241 10.230.105.244 138309 1.000000 1.000000 1024 stuttgarter-sued.olsr
10.230.105.241 10.230.105.245 136001 1.000000 1.000000 1024 stuttgarter-west.olsr
10.230.105.241 10.230.105.242 134818 1.000000 1.000000 1024 stuttgarter-nord.olsr
10.230.105.241 10.230.105.243 137187 1.000000 1.000000 1024 stuttgarter-ost.olsr
10.230.105.241 10.230.105.250 139984 1.000000 1.000000 1024 stuttgarter-hof2.olsr
10.230.105.241 10.230.105.251 138294 1.000000 1.000000 1024 stuttgarter-stra2.olsr

Local               Remote              vTime  LQ       NLQ      Cost Host
2001:bf7:820:901::1 2001:bf7:820:950::1 139703 1.000000 1.000000 1024 stuttgarter-rhnk.olsr
2001:bf7:820:901::1 2001:bf7:820:960::1 139541 1.000000 1.000000 1024 stuttgarter-emma.olsr
2001:bf7:820:901::1 2001:bf7:820:990::1 140415 1.000000 1.000000 1024 stuttgarter-hof2.olsr
2001:bf7:820:901::1 fde6:24f1:a388::1   141338 1.000000 1.000000 1024

the filenames for the olsrd hosts-file is taken from uci
and falls back to sane defaults.

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
2015-11-20 20:46: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
marcel-sch
e75f6b1f9d update profile 2015-11-18 16:38:05 +01:00
Manuel Munz
8b08756d93 contrib/package/freifunk-policyrouting: remove rc.d symlink 2015-11-18 12:34:06 +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