diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-08-17 18:32:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-17 18:32:50 +0200 |
| commit | fd32782491007b33fb877327b647e3b273aecfce (patch) | |
| tree | 67c87246e86025ad8cc18adec8752b800a5d6b40 | |
| parent | d175c09bea24b0a52d15350f025ca418f5f066c5 (diff) | |
| parent | c2eff9bbe3a30f705e16363a581c0f45bf51c948 (diff) | |
| download | master-187ad058-fd32782491007b33fb877327b647e3b273aecfce.tar.gz master-187ad058-fd32782491007b33fb877327b647e3b273aecfce.tar.bz2 master-187ad058-fd32782491007b33fb877327b647e3b273aecfce.zip | |
Merge pull request #56 from cshore/pull-request-httpd-basic-auth
network/services/uhttpd: Add Basic Auth config
| -rw-r--r-- | package/network/services/uhttpd/files/uhttpd.config | 10 | ||||
| -rwxr-xr-x | package/network/services/uhttpd/files/uhttpd.init | 29 |
2 files changed, 38 insertions, 1 deletions
diff --git a/package/network/services/uhttpd/files/uhttpd.config b/package/network/services/uhttpd/files/uhttpd.config index e14b9fefd7..bdc0675099 100644 --- a/package/network/services/uhttpd/files/uhttpd.config +++ b/package/network/services/uhttpd/files/uhttpd.config @@ -103,6 +103,11 @@ config uhttpd main # except for development and debug purposes! # option no_ubusauth 0 + # For this instance of uhttpd use the listed httpauth + # sections to require Basic auth to the specified + # resources. +# list httpauth prefix_user + # Certificate defaults for px5g key generator config cert px5g @@ -120,3 +125,8 @@ config cert px5g # Common name option commonname OpenWrt + +# config httpauth prefix_user +# option prefix /protected/url/path +# option username user +# option password 'plaintext_or_md5_or_$p$user_for_system_user'
\ No newline at end of file diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 4ca6c8d626..d411d2aaf5 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -53,6 +53,21 @@ generate_keys() { } } +create_httpauth() { + local cfg="$1" + local prefix username password + + config_get prefix "$cfg" prefix + config_get username "$cfg" username + config_get password "$cfg" password + + if [ -z "$prefix" ] || [ -z "$username" ] || [ -z "$password" ]; then + return + fi + echo "${prefix}:${username}:${password}" >>$httpdconf + haveauth=1 +} + start_instance() { UHTTPD_CERT="" @@ -60,13 +75,25 @@ start_instance() local cfg="$1" local realm="$(uci_get system.@system[0].hostname)" - local listen http https interpreter indexes path handler + local listen http https interpreter indexes path handler httpdconf haveauth procd_open_instance procd_set_param respawn procd_set_param stderr 1 procd_set_param command "$UHTTPD_BIN" -f + config_get config "$cfg" config + if [ -z "$config" ]; then + mkdir -p /var/etc/uhttpd + httpdconf="/var/etc/uhttpd/httpd.${cfg}.conf" + rm -f ${httpdconf} + config_list_foreach "$cfg" httpauth create_httpauth + if [ "$haveauth" = "1" ]; then + procd_append_param command -c ${httpdconf} + [ -r /etc/httpd.conf ] && cat /etc/httpd.conf >>/var/etc/uhttpd/httpd.${cfg}.conf + fi + fi + append_arg "$cfg" home "-h" append_arg "$cfg" realm "-r" "${realm:-OpenWrt}" append_arg "$cfg" config "-c" |