Filebrowser

diff --git a/libs/cbi/luasrc/view/cbi/simpleform.htm b/libs/cbi/luasrc/view/cbi/simpleform.htm index 2a80723cb..66810a071 100644 --- a/libs/cbi/luasrc/view/cbi/simpleform.htm +++ b/libs/cbi/luasrc/view/cbi/simpleform.htm @@ -13,7 +13,7 @@ $Id$ -%> -"> +

diff --git a/libs/core/luasrc/fs.lua b/libs/core/luasrc/fs.lua index abea5b5e8..830536cbe 100644 --- a/libs/core/luasrc/fs.lua +++ b/libs/core/luasrc/fs.lua @@ -54,12 +54,19 @@ access = posix.access glob = posix.glob --- Checks wheather the given path exists and points to a regular file. --- @param filename String containing the path of the file to read +-- @param filename String containing the path of the file to test -- @return Boolean indicating wheather given path points to regular file function isfile(filename) return posix.stat(filename, "type") == "regular" end +--- Checks wheather the given path exists and points to a directory. +-- @param dirname String containing the path of the directory to test +-- @return Boolean indicating wheather given path points to directory +function isdirectory(dirname) + return posix.stat(dirname, "type") == "directory" +end + --- Read the whole content of the given file into memory. -- @param filename String containing the path of the file to read -- @return String containing the file contents or nil on error diff --git a/libs/core/luasrc/init.lua b/libs/core/luasrc/init.lua index 1861e9283..2eacc6ca9 100644 --- a/libs/core/luasrc/init.lua +++ b/libs/core/luasrc/init.lua @@ -25,5 +25,5 @@ limitations under the License. ]]-- module "luci" -__version__ = "0.8" +__version__ = "0.9" __appname__ = "LuCI" diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua index ea1fccbc1..10606e825 100644 --- a/libs/core/luasrc/util.lua +++ b/libs/core/luasrc/util.lua @@ -193,14 +193,16 @@ end --- Create valid XML PCDATA from given string. -- @param value String value containing the data to escape -- @return String value containing the escaped data +local _pcdata_repl = { + ["&"] = "&", + ['"'] = """, + ["'"] = "'", + ["<"] = "<", + [">"] = ">" +} + function pcdata(value) - return value and tostring(value):gsub("[&\"'<>]", { - ["&"] = "&", - ['"'] = """, - ["'"] = "'", - ["<"] = "<", - [">"] = ">" - }) + return value and tostring(value):gsub("[&\"'<>]", _pcdata_repl) end --- Strip HTML tags from given string. diff --git a/libs/http/luasrc/http/protocol.lua b/libs/http/luasrc/http/protocol.lua index cd482a94f..d8ef09f7a 100644 --- a/libs/http/luasrc/http/protocol.lua +++ b/libs/http/luasrc/http/protocol.lua @@ -673,6 +673,7 @@ end -- @class table statusmsg = { [200] = "OK", + [206] = "Partial Content", [301] = "Moved Permanently", [302] = "Found", [304] = "Not Modified", @@ -680,8 +681,10 @@ statusmsg = { [403] = "Forbidden", [404] = "Not Found", [405] = "Method Not Allowed", + [408] = "Request Time-out", [411] = "Length Required", [412] = "Precondition Failed", + [416] = "Requested range not satisfiable", [500] = "Internal Server Error", [503] = "Server Unavailable", } diff --git a/libs/http/luasrc/http/protocol/date.lua b/libs/http/luasrc/http/protocol/date.lua index 24da1bafb..83d11e2c2 100644 --- a/libs/http/luasrc/http/protocol/date.lua +++ b/libs/http/luasrc/http/protocol/date.lua @@ -17,116 +17,14 @@ $Id$ -- This class contains functions to parse, compare and format http dates. module("luci.http.protocol.date", package.seeall) +require("luci.sys.zoneinfo") + + MONTHS = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" } ---- The "TZ" table contains lowercased timezone names associated with their --- corresponding time offsets sepcified in seconds. --- @class table -TZ = { - -- DST zones - ["brst"] = -2*3600; -- Brazil Summer Time (East Daylight) - ["adt"] = -3*3600; -- Atlantic Daylight - ["edt"] = -4*3600; -- Eastern Daylight - ["cdt"] = -5*3600; -- Central Daylight - ["mdt"] = -6*3600; -- Mountain Daylight - ["pdt"] = -7*3600; -- Pacific Daylight - ["ydt"] = -8*3600; -- Yukon Daylight - ["hdt"] = -9*3600; -- Hawaii Daylight - ["bst"] = 1*3600; -- British Summer - ["mest"] = 2*3600; -- Middle European Summer - ["sst"] = 2*3600; -- Swedish Summer - ["fst"] = 2*3600; -- French Summer - ["eest"] = 3*3600; -- Eastern European Summer - ["cest"] = 2*3600; -- Central European Daylight - ["wadt"] = 8*3600; -- West Australian Daylight - ["kdt"] = 10*3600; -- Korean Daylight - ["eadt"] = 11*3600; -- Eastern Australian Daylight - ["nzdt"] = 13*3600; -- New Zealand Daylight - - -- zones - ["gmt"] = 0; -- Greenwich Mean - ["ut"] = 0; -- Universal (Coordinated) - ["utc"] = 0; - ["wet"] = 0; -- Western European - ["wat"] = -1*3600; -- West Africa - ["azost"] = -1*3600; -- Azores Standard Time - ["cvt"] = -1*3600; -- Cape Verde Time - ["at"] = -2*3600; -- Azores - ["fnt"] = -2*3600; -- Brazil Time (Extreme East - Fernando Noronha) - ["ndt"] = -2*3600+1800;-- Newfoundland Daylight - ["art"] = -3*3600; -- Argentina Time - ["nft"] = -3*3600+1800;-- Newfoundland - ["mnt"] = -4*3600; -- Brazil Time (West Standard - Manaus) - ["ewt"] = -4*3600; -- U.S. Eastern War Time - ["ast"] = -4*3600; -- Atlantic Standard - ["bot"] = -4*3600; -- Bolivia Time - ["vet"] = -4*3600; -- Venezuela Time - ["est"] = -5*3600; -- Eastern Standard - ["cot"] = -5*3600; -- Colombia Time - ["act"] = -5*3600; -- Brazil Time (Extreme West - Acre) - ["pet"] = -5*3600; -- Peru Time - ["cst"] = -6*3600; -- Central Standard - ["cest"] = 2*3600; -- Central European Summer - ["mst"] = -7*3600; -- Mountain Standard - ["pst"] = -8*3600; -- Pacific Standard - ["yst"] = -9*3600; -- Yukon Standard - ["hst"] = -10*3600; -- Hawaii Standard - ["cat"] = -10*3600; -- Central Alaska - ["ahst"] = -10*3600; -- Alaska-Hawaii Standard - ["taht"] = -10*3600; -- Tahiti Time - ["nt"] = -11*3600; -- Nome - ["idlw"] = -12*3600; -- International Date Line West - ["cet"] = 1*3600; -- Central European - ["mez"] = 1*3600; -- Central European (German) - ["met"] = 1*3600; -- Middle European - ["mewt"] = 1*3600; -- Middle European Winter - ["swt"] = 1*3600; -- Swedish Winter - ["set"] = 1*3600; -- Seychelles - ["fwt"] = 1*3600; -- French Winter - ["west"] = 1*3600; -- Western Europe Summer Time - ["eet"] = 2*3600; -- Eastern Europe; USSR Zone 1 - ["ukr"] = 2*3600; -- Ukraine - ["sast"] = 2*3600; -- South Africa Standard Time - ["bt"] = 3*3600; -- Baghdad; USSR Zone 2 - ["eat"] = 3*3600; -- East Africa Time - ["irst"] = 3*3600+1800;-- Iran Standard Time - ["zp4"] = 4*3600; -- USSR Zone 3 - ["msd"] = 4*3600; -- Moscow Daylight Time - ["sct"] = 4*3600; -- Seychelles Time - ["zp5"] = 5*3600; -- USSR Zone 4 - ["azst"] = 5*3600; -- Azerbaijan Summer Time - ["mvt"] = 5*3600; -- Maldives Time - ["uzt"] = 5*3600; -- Uzbekistan Time - ["ist"] = 5*3600+1800;-- Indian Standard - ["zp6"] = 6*3600; -- USSR Zone 5 - ["lkt"] = 6*3600; -- Sri Lanka Time - ["pkst"] = 6*3600; -- Pakistan Summer Time - ["yekst"] = 6*3600; -- Yekaterinburg Summer Time - ["wast"] = 7*3600; -- West Australian Standard - ["ict"] = 7*3600; -- Indochina Time - ["wit"] = 7*3600; -- Western Indonesia Time - ["cct"] = 8*3600; -- China Coast; USSR Zone 7 - ["wst"] = 8*3600; -- West Australian Standard - ["hkt"] = 8*3600; -- Hong Kong - ["bnt"] = 8*3600; -- Brunei Darussalam Time - ["cit"] = 8*3600; -- Central Indonesia Time - ["myt"] = 8*3600; -- Malaysia Time - ["pht"] = 8*3600; -- Philippines Time - ["sgt"] = 8*3600; -- Singapore Time - ["jst"] = 9*3600; -- Japan Standard; USSR Zone 8 - ["kst"] = 9*3600; -- Korean Standard - ["east"] = 10*3600; -- Eastern Australian Standard - ["gst"] = 10*3600; -- Guam Standard; USSR Zone 9 - ["nct"] = 11*3600; -- New Caledonia Time - ["nzt"] = 12*3600; -- New Zealand - ["nzst"] = 12*3600; -- New Zealand Standard - ["fjt"] = 12*3600; -- Fiji Time - ["idle"] = 12*3600; -- International Date Line East -} - --- Return the time offset in seconds between the UTC and given time zone. -- @param tz Symbolic or numeric timezone specifier -- @return Time offset to UTC in seconds @@ -143,8 +41,8 @@ function tz_offset(tz) return s * 60 * ( math.floor( v / 100 ) * 60 + ( v % 100 ) ) -- lookup symbolic tz - elseif TZ[tz:lower()] then - return TZ[tz:lower()] + elseif luci.sys.zoneinfo.OFFSET[tz:lower()] then + return luci.sys.zoneinfo.OFFSET[tz:lower()] end end diff --git a/libs/httpd/host/runluci b/libs/httpd/host/runluci index 65c6b6cf1..bc56f15c1 100755 --- a/libs/httpd/host/runluci +++ b/libs/httpd/host/runluci @@ -22,6 +22,11 @@ pcall(function() require "luci.model.uci".cursor = function(config, save) return uci.cursor(config or SYSROOT .. "/etc/config", save or SYSROOT .. "/tmp/.uci") end + + local x = require "luci.uvl".UVL.__init__ + require "luci.uvl".UVL.__init__ = function(self, schemedir) + x(self, schemedir or SYSROOT .. "/lib/uci/schema") + end end) require("luci.sys") diff --git a/libs/httpd/luasrc/httpd/server.lua b/libs/httpd/luasrc/httpd/server.lua index 6cbffa188..fd4db1484 100644 --- a/libs/httpd/luasrc/httpd/server.lua +++ b/libs/httpd/luasrc/httpd/server.lua @@ -168,7 +168,9 @@ function Server.process( self, client ) self:error( thread, 411, luci.http.protocol.statusmsg[411] ) break; end - + + -- FIXME: Close for POST requests + close = true else self:error( thread, 405, luci.http.protocol.statusmsg[405] ) break; diff --git a/libs/sgi-webuci/boa-patches/220-ipv6-vs-ipv4.patch b/libs/sgi-webuci/boa-patches/220-ipv6-vs-ipv4.patch new file mode 100644 index 000000000..5d0eb6a03 --- /dev/null +++ b/libs/sgi-webuci/boa-patches/220-ipv6-vs-ipv4.patch @@ -0,0 +1,257 @@ +diff -urN boa-0.94.13.orig/src/boa.c boa-0.94.13/src/boa.c +--- boa-0.94.13.orig/src/boa.c 2008-10-28 16:15:45.000000000 +0100 ++++ boa-0.94.13/src/boa.c 2008-10-28 15:56:27.000000000 +0100 +@@ -27,6 +27,12 @@ + #include + + /* globals */ ++ ++#ifdef INET6 ++int server_addr_family; ++socklen_t server_addr_len; ++#endif ++ + int backlog = SO_MAXCONN; + time_t start_time; + +@@ -164,14 +170,36 @@ + return 0; + } + ++#ifdef INET6 ++sa_family_t *get_addr_family(struct sockaddr *address) ++{ ++ if(server_addr_family == AF_INET6) { ++ return &(((struct sockaddr_in6 *) address)->sin6_family); ++ } ++ ++ return &(((struct sockaddr_in *) address)->sin_family); ++} ++#endif ++ + static int create_server_socket(void) + { + int server_s; + +- server_s = socket(SERVER_AF, SOCK_STREAM, IPPROTO_TCP); ++#ifdef INET6 ++ server_addr_family = AF_INET6; ++ server_addr_len = sizeof(struct sockaddr_in6); ++ server_s = socket(server_addr_family, SOCK_STREAM, IPPROTO_TCP); + if (server_s == -1) { +- DIE("unable to create socket"); ++ server_addr_family = AF_INET; ++ server_addr_len = sizeof(struct sockaddr_in); ++#endif ++ server_s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ++ if (server_s == -1) { ++ DIE("unable to create socket"); ++ } ++#ifdef INET6 + } ++#endif + + /* server socket is nonblocking */ + if (set_nonblock_fd(server_s) == -1) { +diff -urN boa-0.94.13.orig/src/boa.h boa-0.94.13/src/boa.h +--- boa-0.94.13.orig/src/boa.h 2008-10-28 16:15:58.000000000 +0100 ++++ boa-0.94.13/src/boa.h 2008-10-28 14:45:52.000000000 +0100 +@@ -199,4 +199,12 @@ + int plugin_handle(request * req); + struct httpd_plugin *plugin_lookup(request *req); + ++/* IPv6 */ ++ ++#ifdef INET6 ++extern int server_addr_family; ++extern socklen_t server_addr_len; ++sa_family_t *get_addr_family(struct sockaddr *address); ++#endif ++ + #endif +diff -urN boa-0.94.13.orig/src/compat.h boa-0.94.13/src/compat.h +--- boa-0.94.13.orig/src/compat.h 2002-06-06 07:02:28.000000000 +0200 ++++ boa-0.94.13/src/compat.h 2008-10-28 15:31:16.000000000 +0100 +@@ -71,11 +71,13 @@ + + #ifdef INET6 + #define SOCKADDR sockaddr_storage +-#define S_FAMILY __s_family +-#define SERVER_AF AF_INET6 ++#define SOCKADDR_LEN server_addr_len ++#define S_FAMILY(address) (*get_addr_family((struct sockaddr *) (address))) ++#define SERVER_AF server_addr_family + #else + #define SOCKADDR sockaddr_in +-#define S_FAMILY sin_family ++#define SOCKADDR_LEN sizeof(struct sockaddr_in) ++#define S_FAMILY(address) ((*address).sin_family) + #define SERVER_AF AF_INET + #endif + +diff -urN boa-0.94.13.orig/src/ip.c boa-0.94.13/src/ip.c +--- boa-0.94.13.orig/src/ip.c 2002-01-21 03:19:16.000000000 +0100 ++++ boa-0.94.13/src/ip.c 2008-10-28 15:52:05.000000000 +0100 +@@ -44,52 +44,64 @@ + + #include "boa.h" + #include /* inet_ntoa */ ++#include + + /* Binds to the existing server_s, based on the configuration string + in server_ip. IPv6 version doesn't pay attention to server_ip yet. */ + int bind_server(int server_s, char *server_ip) + { ++ struct sockaddr *server_sockaddr; ++ struct sockaddr_in server_sockaddr4; ++ + #ifdef INET6 +- struct sockaddr_in6 server_sockaddr; +- server_sockaddr.sin6_family = AF_INET6; +- memcpy(&server_sockaddr.sin6_addr, &in6addr_any, sizeof (in6addr_any)); +- server_sockaddr.sin6_port = htons(server_port); +-#else +- struct sockaddr_in server_sockaddr; +- memset(&server_sockaddr, 0, sizeof server_sockaddr); ++ struct sockaddr_in6 server_sockaddr6; ++ if(SERVER_AF == AF_INET6) { ++ server_sockaddr6.sin6_family = AF_INET6; ++ memcpy(&server_sockaddr6.sin6_addr, &in6addr_any, sizeof (in6addr_any)); ++ server_sockaddr6.sin6_port = htons(server_port); ++ server_sockaddr = (struct sockaddr *) &server_sockaddr6; ++ } else { ++#endif ++ memset(&server_sockaddr4, 0, SOCKADDR_LEN); + #ifdef HAVE_SIN_LEN /* uncomment for BSDs */ +- server_sockaddr.sin_len = sizeof server_sockaddr; ++ server_sockaddr4.sin_len = SOCKADDR_LEN; + #endif +- server_sockaddr.sin_family = AF_INET; +- if (server_ip != NULL) { +- inet_aton(server_ip, &server_sockaddr.sin_addr); +- } else { +- server_sockaddr.sin_addr.s_addr = htonl(INADDR_ANY); ++ server_sockaddr4.sin_family = AF_INET; ++ if (server_ip != NULL) { ++ inet_aton(server_ip, &server_sockaddr4.sin_addr); ++ } else { ++ server_sockaddr4.sin_addr.s_addr = htonl(INADDR_ANY); ++ } ++ server_sockaddr4.sin_port = htons(server_port); ++ server_sockaddr = (struct sockaddr *) &server_sockaddr4; ++#ifdef INET6 + } +- server_sockaddr.sin_port = htons(server_port); + #endif + +- return bind(server_s, (struct sockaddr *) &server_sockaddr, +- sizeof (server_sockaddr)); ++ return bind(server_s, server_sockaddr, SOCKADDR_LEN); + } + + char *ascii_sockaddr(struct SOCKADDR *s, char *dest, int len) + { + #ifdef INET6 +- if (getnameinfo((struct sockaddr *) s, +- sizeof(struct SOCKADDR), +- dest, len, NULL, 0, NI_NUMERICHOST)) { +- fprintf(stderr, "[IPv6] getnameinfo failed\n"); +- *dest = '\0'; +- } ++ if(SERVER_AF == AF_INET6) { ++ if (getnameinfo((struct sockaddr *) s, ++ SOCKADDR_LEN, ++ dest, len, NULL, 0, NI_NUMERICHOST)) { ++ fprintf(stderr, "[IPv6] getnameinfo failed\n"); ++ *dest = '\0'; ++ } + #ifdef WHEN_DOES_THIS_APPLY +- if ((s->__ss_family == AF_INET6) && +- IN6_IS_ADDR_V4MAPPED(&(((struct sockaddr_in6 *) s)->sin6_addr))) { +- memmove(dest, dest+7, NI_MAXHOST); +- } ++ if (((((struct sockaddr_in6 *) s)->sin6_family) == AF_INET6) && ++ IN6_IS_ADDR_V4MAPPED(&(((struct sockaddr_in6 *) s)->sin6_addr))) { ++ memmove(dest, dest+7, NI_MAXHOST); ++ } + #endif +-#else +- memmove(dest, inet_ntoa(s->sin_addr), len); ++ } else { ++#endif ++ memmove(dest, inet_ntoa(((struct sockaddr_in *) s)->sin_addr), len); ++#ifdef INET6 ++ } + #endif + return dest; + } +@@ -98,17 +110,21 @@ + { + int p = -1; + #ifdef INET6 +- char serv[NI_MAXSERV]; ++ if(SERVER_AF == AF_INET6) { ++ char serv[NI_MAXSERV]; + +- if (getnameinfo((struct sockaddr *) s, +- sizeof(struct SOCKADDR), +- NULL, 0, serv, sizeof(serv), NI_NUMERICSERV)) { +- fprintf(stderr, "[IPv6] getnameinfo failed\n"); ++ if (getnameinfo((struct sockaddr *) s, ++ SOCKADDR_LEN, ++ NULL, 0, serv, sizeof(serv), NI_NUMERICSERV)) { ++ fprintf(stderr, "[IPv6] getnameinfo failed\n"); ++ } else { ++ p = atoi(serv); ++ } + } else { +- p = atoi(serv); ++#endif ++ p = ntohs(((struct sockaddr_in *) s)->sin_port); ++#ifdef INET6 + } +-#else +- p = ntohs(s->sin_port); + #endif + return p; + } +diff -urN boa-0.94.13.orig/src/mmap_cache.c boa-0.94.13/src/mmap_cache.c +--- boa-0.94.13.orig/src/mmap_cache.c 2002-03-24 23:35:34.000000000 +0100 ++++ boa-0.94.13/src/mmap_cache.c 2008-10-28 14:55:16.000000000 +0100 +@@ -67,7 +67,7 @@ + + m = mmap(0, s->st_size, PROT_READ, MAP_OPTIONS, data_fd, 0); + +- if ((int) m == -1) { ++ if ((ssize_t) m == -1) { + /* boa_perror(req,"mmap"); */ + return NULL; + } +diff -urN boa-0.94.13.orig/src/request.c boa-0.94.13/src/request.c +--- boa-0.94.13.orig/src/request.c 2008-10-28 16:16:03.000000000 +0100 ++++ boa-0.94.13/src/request.c 2008-10-28 15:17:20.000000000 +0100 +@@ -75,12 +75,12 @@ + int fd; /* socket */ + struct SOCKADDR remote_addr; /* address */ + struct SOCKADDR salocal; +- int remote_addrlen = sizeof (struct SOCKADDR); ++ int remote_addrlen = SOCKADDR_LEN; + request *conn; /* connection */ +- size_t len; ++ socklen_t len; + static int system_bufsize = 0; /* Default size of SNDBUF given by system */ + +- remote_addr.S_FAMILY = 0xdead; ++ S_FAMILY(&remote_addr) = 0xdead; + fd = accept(server_s, (struct sockaddr *) &remote_addr, + &remote_addrlen); + +@@ -133,7 +133,7 @@ + } + #endif + +- len = sizeof(salocal); ++ len = SOCKADDR_LEN; + + if (getsockname(fd, (struct sockaddr *) &salocal, &len) != 0) { + WARN("getsockname"); diff --git a/libs/sys/luasrc/sys/zoneinfo.lua b/libs/sys/luasrc/sys/zoneinfo.lua index 7bd02d934..d6de70425 100644 --- a/libs/sys/luasrc/sys/zoneinfo.lua +++ b/libs/sys/luasrc/sys/zoneinfo.lua @@ -67,17 +67,18 @@ TZ = { { 'America/Anguilla', 'AST4' }, { 'America/Antigua', 'AST4' }, { 'America/Araguaina', 'BRT3' }, - { 'America/Argentina/Buenos Aires', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, - { 'America/Argentina/Catamarca', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, - { 'America/Argentina/Cordoba', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, - { 'America/Argentina/Jujuy', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, - { 'America/Argentina/La Rioja', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, - { 'America/Argentina/Mendoza', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, - { 'America/Argentina/Rio Gallegos', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, - { 'America/Argentina/San Juan', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, + { 'America/Argentina/Buenos Aires', 'ART3ARST,M10.3.0/0,M3.3.0/0' }, + { 'America/Argentina/Catamarca', 'ART3' }, + { 'America/Argentina/Cordoba', 'ART3ARST,M10.3.0/0,M3.3.0/0' }, + { 'America/Argentina/Jujuy', 'ART3' }, + { 'America/Argentina/La Rioja', 'ART3' }, + { 'America/Argentina/Mendoza', 'ART3' }, + { 'America/Argentina/Rio Gallegos', 'ART3' }, + { 'America/Argentina/Salta', 'ART3' }, + { 'America/Argentina/San Juan', 'ART3' }, { 'America/Argentina/San Luis', 'ART3' }, - { 'America/Argentina/Tucuman', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, - { 'America/Argentina/Ushuaia', 'ART3ARST,M10.1.0/0,M3.3.0/0' }, + { 'America/Argentina/Tucuman', 'ART3ARST,M10.3.0/0,M3.3.0/0' }, + { 'America/Argentina/Ushuaia', 'ART3' }, { 'America/Aruba', 'AST4' }, { 'America/Asuncion', 'PYT4PYST,M10.3.0/0,M3.2.0/0' }, { 'America/Atikokan', 'EST5' }, @@ -90,7 +91,7 @@ TZ = { { 'America/Bogota', 'COT5' }, { 'America/Boise', 'MST7MDT,M3.2.0,M11.1.0' }, { 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' }, - { 'America/Campo Grande', 'AMT4AMST,M10.2.0/0,M2.3.0/0' }, + { 'America/Campo Grande', 'AMT4AMST,M10.3.0/0,M2.3.0/0' }, { 'America/Cancun', 'CST6CDT,M4.1.0,M10.5.0' }, { 'America/Caracas', 'VET4:30' }, { 'America/Cayenne', 'GFT3' }, @@ -98,7 +99,7 @@ TZ = { { 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' }, { 'America/Costa Rica', 'CST6' }, - { 'America/Cuiaba', 'AMT4AMST,M10.2.0/0,M2.3.0/0' }, + { 'America/Cuiaba', 'AMT4AMST,M10.3.0/0,M2.3.0/0' }, { 'America/Curacao', 'AST4' }, { 'America/Danmarkshavn', 'GMT0' }, { 'America/Dawson', 'PST8PDT,M3.2.0,M11.1.0' }, @@ -176,7 +177,7 @@ TZ = { { 'America/Rio Branco', 'AMT4' }, { 'America/Santarem', 'BRT3' }, { 'America/Santo Domingo', 'AST4' }, - { 'America/Sao Paulo', 'BRT3BRST,M10.2.0/0,M2.3.0/0' }, + { 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' }, { 'America/Scoresbysund', 'EGT1EGST,M3.5.0/0,M10.5.0/1' }, { 'America/Shiprock', 'MST7MDT,M3.2.0,M11.1.0' }, { 'America/St Barthelemy', 'AST4' }, @@ -224,12 +225,12 @@ TZ = { { 'Asia/Choibalsan', 'CHOT-8' }, { 'Asia/Chongqing', 'CST-8' }, { 'Asia/Colombo', 'IST-5:30' }, - { 'Asia/Damascus', 'EET-2EEST,M4.1.5/0,J274/0' }, + { 'Asia/Damascus', 'EET-2EEST,M4.1.5/0,J305/0' }, { 'Asia/Dhaka', 'BDT-6' }, { 'Asia/Dili', 'TLT-9' }, { 'Asia/Dubai', 'GST-4' }, { 'Asia/Dushanbe', 'TJT-5' }, - { 'Asia/Gaza', 'EET-2EEST,J91/0,M9.2.4' }, + { 'Asia/Gaza', 'EET-2EEST,J91/0,M8.5.4' }, { 'Asia/Harbin', 'CST-8' }, { 'Asia/Ho Chi Minh', 'ICT-7' }, { 'Asia/Hong Kong', 'HKT-8' }, @@ -365,7 +366,7 @@ TZ = { { 'Indian/Kerguelen', 'TFT-5' }, { 'Indian/Mahe', 'SCT-4' }, { 'Indian/Maldives', 'MVT-5' }, - { 'Indian/Mauritius', 'MUT-4' }, + { 'Indian/Mauritius', 'MUT-4MUST,M10.5.0,M3.5.0/3' }, { 'Indian/Mayotte', 'EAT-3' }, { 'Indian/Reunion', 'RET-4' }, { 'Pacific/Apia', 'WST11' }, @@ -406,3 +407,166 @@ TZ = { { 'Pacific/Wake', 'WAKT-12' }, { 'Pacific/Wallis', 'WFT-12' }, } + +OFFSET = { + gmt = 0, -- GMT + eat = 10800, -- EAT + cet = 3600, -- CET + wat = 3600, -- WAT + cat = 7200, -- CAT + wet = 0, -- WET + sast = 7200, -- SAST + eet = 7200, -- EET + hast = -36000, -- HAST + hadt = -32400, -- HADT + akst = -32400, -- AKST + akdt = -28800, -- AKDT + ast = -14400, -- AST + brt = -10800, -- BRT + art = -10800, -- ART + arst = -7200, -- ARST + pyt = -14400, -- PYT + pyst = -10800, -- PYST + est = -18000, -- EST + cst = -21600, -- CST + amt = -14400, -- AMT + cot = -18000, -- COT + mst = -25200, -- MST + mdt = -21600, -- MDT + vet = -16200, -- VET + gft = -10800, -- GFT + pst = -28800, -- PST + pdt = -25200, -- PDT + ect = -18000, -- ECT + gyt = -14400, -- GYT + bot = -14400, -- BOT + pet = -18000, -- PET + pmst = -10800, -- PMST + pmdt = -7200, -- PMDT + uyt = -10800, -- UYT + uyst = -7200, -- UYST + fnt = -7200, -- FNT + srt = -10800, -- SRT + egt = -3600, -- EGT + egst = 0, -- EGST + nst = -12600, -- NST + ndt = -9000, -- NDT + wst = 28800, -- WST + davt = 25200, -- DAVT + ddut = 36000, -- DDUT + mawt = 21600, -- MAWT + nzst = 43200, -- NZST + nzdt = 46800, -- NZDT + rott = -10800, -- ROTT + syot = 10800, -- SYOT + vost = 21600, -- VOST + almt = 21600, -- ALMT + anat = 43200, -- ANAT + anast = 46800, -- ANAST + aqtt = 18000, -- AQTT + tmt = 18000, -- TMT + azt = 14400, -- AZT + azst = 18000, -- AZST + ict = 25200, -- ICT + kgt = 21600, -- KGT + bnt = 28800, -- BNT + chot = 28800, -- CHOT + ist = 19800, -- IST + bdt = 21600, -- BDT + tlt = 32400, -- TLT + gst = 14400, -- GST + tjt = 18000, -- TJT + hkt = 28800, -- HKT + hovt = 25200, -- HOVT + irkt = 28800, -- IRKT + irkst = 32400, -- IRKST + wit = 25200, -- WIT + eit = 32400, -- EIT + aft = 16200, -- AFT + pett = 43200, -- PETT + petst = 46800, -- PETST + pkt = 18000, -- PKT + npt = 20700, -- NPT + krat = 25200, -- KRAT + krast = 28800, -- KRAST + myt = 28800, -- MYT + magt = 39600, -- MAGT + magst = 43200, -- MAGST + cit = 28800, -- CIT + pht = 28800, -- PHT + novt = 21600, -- NOVT + novst = 25200, -- NOVST + omst = 21600, -- OMST + omsst = 25200, -- OMSST + orat = 18000, -- ORAT + kst = 32400, -- KST + qyzt = 21600, -- QYZT + mmt = 23400, -- MMT + sakt = 36000, -- SAKT + sakst = 39600, -- SAKST + uzt = 18000, -- UZT + sgt = 28800, -- SGT + get = 14400, -- GET + btt = 21600, -- BTT + jst = 32400, -- JST + ulat = 28800, -- ULAT + vlat = 36000, -- VLAT + vlast = 39600, -- VLAST + yakt = 32400, -- YAKT + yakst = 36000, -- YAKST + yekt = 18000, -- YEKT + yekst = 21600, -- YEKST + azot = -3600, -- AZOT + azost = 0, -- AZOST + cvt = -3600, -- CVT + fkt = -14400, -- FKT + fkst = -10800, -- FKST + cwst = 31500, -- CWST + lhst = 37800, -- LHST + lhst = 39600, -- LHST + msk = 10800, -- MSK + msd = 14400, -- MSD + samt = 14400, -- SAMT + samst = 18000, -- SAMST + volt = 10800, -- VOLT + volst = 14400, -- VOLST + iot = 21600, -- IOT + cxt = 25200, -- CXT + cct = 23400, -- CCT + tft = 18000, -- TFT + sct = 14400, -- SCT + mvt = 18000, -- MVT + mut = 14400, -- MUT + must = 18000, -- MUST + ret = 14400, -- RET + chast = 45900, -- CHAST + chadt = 49500, -- CHADT + vut = 39600, -- VUT + phot = 46800, -- PHOT + tkt = -36000, -- TKT + fjt = 43200, -- FJT + tvt = 43200, -- TVT + galt = -21600, -- GALT + gamt = -32400, -- GAMT + sbt = 39600, -- SBT + hst = -36000, -- HST + lint = 50400, -- LINT + kost = 39600, -- KOST + mht = 43200, -- MHT + mart = -34200, -- MART + sst = -39600, -- SST + nrt = 43200, -- NRT + nut = -39600, -- NUT + nft = 41400, -- NFT + nct = 39600, -- NCT + pwt = 32400, -- PWT + pont = 39600, -- PONT + pgt = 36000, -- PGT + ckt = -36000, -- CKT + taht = -36000, -- TAHT + gilt = 43200, -- GILT + tot = 46800, -- TOT + trut = 36000, -- TRUT + wakt = 43200, -- WAKT + wft = 43200, -- WFT +} diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua index 8773974cf..f69713a91 100644 --- a/libs/web/luasrc/dispatcher.lua +++ b/libs/web/luasrc/dispatcher.lua @@ -47,7 +47,12 @@ local fi -- @param ... Virtual path -- @return Relative URL function build_url(...) - return luci.http.getenv("SCRIPT_NAME") .. "/" .. table.concat(arg, "/") + local path = {...} + local sn = http.getenv("SCRIPT_NAME") or "" + for k, v in pairs(context.urltoken) do + sn = sn .. "/;" .. k .. "=" .. http.urlencode(v) + end + return sn .. ((#path > 0) and "/" .. table.concat(path, "/") or "") end --- Send a 404 error code and render the "error404" template if available. @@ -123,6 +128,7 @@ function dispatch(request) --context._disable_memtrace = require "luci.debug".trap_memtrace() local ctx = context ctx.path = request + ctx.urltoken = ctx.urltoken or {} require "luci.i18n".setlanguage(require "luci.config".main.lang) @@ -137,18 +143,32 @@ function dispatch(request) ctx.args = args ctx.requestargs = ctx.requestargs or args local n + local t = true + local token = ctx.urltoken + local preq = {} for i, s in ipairs(request) do - c = c.nodes[s] - n = i - if not c then - break + local tkey, tval + if t then + tkey, tval = s:match(";(%w+)=(.*)") end - util.update(track, c) + if tkey then + token[tkey] = tval + else + t = false + preq[#preq+1] = s + c = c.nodes[s] + n = i + if not c then + break + end + + util.update(track, c) - if c.leaf then - break + if c.leaf then + break + end end end @@ -158,6 +178,8 @@ function dispatch(request) end end + ctx.path = preq + if track.i18n then require("luci.i18n").loadc(track.i18n) end @@ -177,17 +199,23 @@ function dispatch(request) assert(media, "No valid theme found") end - local viewns = setmetatable({}, {__index=_G}) + local viewns = setmetatable({}, {__index=function(table, key) + if key == "controller" then + return build_url() + elseif key == "REQUEST_URI" then + return build_url(unpack(ctx.requested.path)) + else + return rawget(table, key) or _G[key] + end + end}) tpl.context.viewns = viewns viewns.write = luci.http.write viewns.include = function(name) tpl.Template(name):render(getfenv(2)) end viewns.translate = function(...) return require("luci.i18n").translate(...) end viewns.striptags = util.striptags - viewns.controller = luci.http.getenv("SCRIPT_NAME") viewns.media = media viewns.theme = fs.basename(media) viewns.resource = luci.config.main.resourcebase - viewns.REQUEST_URI = (luci.http.getenv("SCRIPT_NAME") or "") .. (luci.http.getenv("PATH_INFO") or "") end track.dependent = (track.dependent ~= false) @@ -202,27 +230,50 @@ function dispatch(request) local def = (type(track.sysauth) == "string") and track.sysauth local accs = def and {track.sysauth} or track.sysauth - local sess = ctx.authsession or luci.http.getcookie("sysauth") - sess = sess and sess:match("^[A-F0-9]+$") - local user = sauth.read(sess) + local sess = ctx.authsession + local verifytoken = false + if not sess then + sess = luci.http.getcookie("sysauth") + sess = sess and sess:match("^[A-F0-9]+$") + verifytoken = true + end + + local sdat = sauth.read(sess) + local user + + if sdat then + sdat = loadstring(sdat)() + if not verifytoken or ctx.urltoken.stok == sdat.token then + user = sdat.user + end + end if not util.contains(accs, user) then if authen then + ctx.urltoken.stok = nil local user, sess = authen(luci.sys.user.checkpasswd, accs, def) if not user or not util.contains(accs, user) then return else local sid = sess or luci.sys.uniqueid(16) - luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path=/") if not sess then - sauth.write(sid, user) + local token = luci.sys.uniqueid(16) + sauth.write(sid, util.get_bytecode({ + user=user, + token=token, + secret=luci.sys.uniqueid(16) + })) + ctx.urltoken.stok = token end + luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url()) ctx.authsession = sid end else luci.http.status(403, "Forbidden") return end + else + ctx.authsession = sess end end @@ -354,9 +405,11 @@ function createtree() local ctx = context local tree = {nodes={}} + local modi = {} ctx.treecache = setmetatable({}, {__mode="v"}) ctx.tree = tree + ctx.modifiers = modi -- Load default translation require "luci.i18n".loadc("default") @@ -369,9 +422,31 @@ function createtree() v() end + local function modisort(a,b) + return modi[a].order < modi[b].order + end + + for _, v in util.spairs(modi, modisort) do + scope._NAME = v.module + setfenv(v.func, scope) + v.func() + end + return tree end +--- Register a tree modifier. +-- @param func Modifier function +-- @param order Modifier order value (optional) +function modifier(func, order) + context.modifiers[#context.modifiers+1] = { + func = func, + order = order or 0, + module + = getfenv(2)._NAME + } +end + --- Clone a node of the dispatching tree to another position. -- @param path Virtual path destination -- @param clone Virtual path source @@ -415,7 +490,6 @@ function node(...) local c = _create_node({...}) c.module = getfenv(2)._NAME - c.path = arg c.auto = nil return c @@ -431,10 +505,11 @@ function _create_node(path, cache) local c = cache[name] if not c then + local new = {nodes={}, auto=true, path=util.clone(path)} local last = table.remove(path) + c = _create_node(path, cache) - local new = {nodes={}, auto=true} c.nodes[last] = new cache[name] = new diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua index 894732dfa..5d3dc95ca 100644 --- a/libs/web/luasrc/sauth.lua +++ b/libs/web/luasrc/sauth.lua @@ -60,6 +60,9 @@ function read(id) if not id then return end + if not id:match("^%w+$") then + error("Session ID is not sane!") + end clean() if not sane(sessionpath .. "/" .. id) then return @@ -85,6 +88,19 @@ function write(id, data) if not sane() then prepare() end + if not id:match("^%w+$") then + error("Session ID is not sane!") + end luci.fs.writefile(sessionpath .. "/" .. id, data) luci.fs.chmod(sessionpath .. "/" .. id, "a-rwx,u+rw") +end + + +--- Kills a session +-- @param id Session identifier +function kill(id) + if not id:match("^%w+$") then + error("Session ID is not sane!") + end + luci.fs.unlink(sessionpath .. "/" .. id) end \ No newline at end of file diff --git a/libs/web/root/etc/config/luci b/libs/web/root/etc/config/luci index e3e07beda..0178f6c28 100644 --- a/libs/web/root/etc/config/luci +++ b/libs/web/root/etc/config/luci @@ -7,7 +7,7 @@ config core brand option title "OpenWrt Kamikaze" option subtitle "Lua Configuration Interface" option firmware "OpenWrt Kamikaze" - option distro "" + option distro "Development Snapshot" config extern flash_keep option uci "/etc/config/" diff --git a/modules/admin-core/luasrc/view/indexer.htm b/modules/admin-core/luasrc/view/indexer.htm new file mode 100644 index 000000000..363802bbc --- /dev/null +++ b/modules/admin-core/luasrc/view/indexer.htm @@ -0,0 +1,15 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2008 Steven Barth +Copyright 2008 Jo-Philipp Wich + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id: indexer.htm 3552 2008-10-10 14:37:53Z Cyrus $ + +-%> +<% include("themes/" .. theme .. "/indexer") %> \ No newline at end of file diff --git a/modules/admin-core/luasrc/view/sysauth.htm b/modules/admin-core/luasrc/view/sysauth.htm index a49d80786..42f13fa1f 100644 --- a/modules/admin-core/luasrc/view/sysauth.htm +++ b/modules/admin-core/luasrc/view/sysauth.htm @@ -41,7 +41,7 @@ $Id$

diff --git a/modules/admin-core/root/etc/config/luci_ethers b/modules/admin-core/root/etc/config/luci_ethers index e69de29bb..8b1378917 100644 --- a/modules/admin-core/root/etc/config/luci_ethers +++ b/modules/admin-core/root/etc/config/luci_ethers @@ -0,0 +1 @@ + diff --git a/modules/admin-core/root/etc/config/luci_hosts b/modules/admin-core/root/etc/config/luci_hosts index 6221df72d..8b1378917 100644 --- a/modules/admin-core/root/etc/config/luci_hosts +++ b/modules/admin-core/root/etc/config/luci_hosts @@ -1,3 +1 @@ -config 'host' - option 'ipaddr' '10.11.12.13' - option 'hostname' 'sample-host' + diff --git a/modules/admin-core/root/lib/uci/schema/default/network b/modules/admin-core/root/lib/uci/schema/default/network index 8bf8dd197..5a5866f46 100644 --- a/modules/admin-core/root/lib/uci/schema/default/network +++ b/modules/admin-core/root/lib/uci/schema/default/network @@ -384,7 +384,6 @@ config variable option title 'IPv4 gateway' option section 'network.route' option datatype 'ip4addr' - option required 'true' config variable option name 'metric' diff --git a/modules/admin-full/luasrc/controller/admin/filebrowser.lua b/modules/admin-full/luasrc/controller/admin/filebrowser.lua new file mode 100644 index 000000000..d83139fd7 --- /dev/null +++ b/modules/admin-full/luasrc/controller/admin/filebrowser.lua @@ -0,0 +1,20 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth +Copyright 2008 Jo-Philipp Wich + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- + +module("luci.controller.admin.filebrowser", package.seeall) + +function index() + entry( {"admin", "filebrowser"}, template("cbi/filebrowser") ).leaf = true +end diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua index 071dd595d..e2b812e8c 100644 --- a/modules/admin-full/luasrc/controller/admin/index.lua +++ b/modules/admin-full/luasrc/controller/admin/index.lua @@ -49,6 +49,13 @@ function index() end function action_logout() - luci.http.header("Set-Cookie", "sysauth=; path=/") + local dsp = require "luci.dispatcher" + local sauth = require "luci.sauth" + if dsp.context.authsession then + sauth.kill(dsp.context.authsession) + dsp.context.urltoken.stok = nil + end + + luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url()) luci.http.redirect(luci.dispatcher.build_url()) end \ No newline at end of file diff --git a/modules/admin-full/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua index f7bdb02d5..a137377b3 100644 --- a/modules/admin-full/luasrc/controller/admin/services.lua +++ b/modules/admin-full/luasrc/controller/admin/services.lua @@ -28,10 +28,19 @@ function index() page.order = 40 page.index = true - local page = node("admin", "services", "httpd") - page.target = cbi("admin_services/httpd") - page.title = "Busybox HTTPd" - page.order = 10 + if luci.fs.access("/etc/config/lucittpd") then + local page = node("admin", "services", "lucittpd") + page.target = cbi("admin_services/lucittpd") + page.title = "LuCIttpd" + page.order = 10 + end + + if luci.fs.access("/etc/config/httpd") then + local page = node("admin", "services", "httpd") + page.target = cbi("admin_services/httpd") + page.title = "Busybox HTTPd" + page.order = 11 + end local page = node("admin", "services", "dropbear") page.target = cbi("admin_services/dropbear") diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index b6de14884..9071bfdfe 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -25,7 +25,11 @@ function index() entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30) entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("process_head"), 45) entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab"), 50) - entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60) + + if luci.fs.isdirectory("/sys/class/leds") then + entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60) + end + entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 70) entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("a_s_flash"), 80) entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 90) diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua index 4ab32693e..267c41c9d 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -41,6 +41,7 @@ if has_pppoe then p:value("pppoe", "PPPoE") end if has_pppoa then p:value("pppoa", "PPPoA") end if has_3g then p:value("3g", "UMTS/3G") end if has_pptp then p:value("pptp", "PPTP") end +p:value("none", translate("none")) if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then p.description = translate("network_interface_prereq") diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua index 3a52ef317..6d46a541f 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -161,6 +161,7 @@ bssid = s:option(Value, "bssid", translate("wifi_bssid")) -------------------- MAC80211 Interface ---------------------- if hwtype == "mac80211" then + mode:value("ahdemo", translate("a_w_ahdemo")) mode:value("monitor", translate("a_w_monitor")) bssid:depends({mode="adhoc"}) diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua index 4f19f4e2c..ef46cb4a3 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua @@ -32,7 +32,7 @@ s = m:section(Table, ifaces, translate("networks")) function s.extedit(self, section) local device = self.map:get(section, "device") or "" - return luci.http.getenv("REQUEST_URI") .. "/" .. device + return luci.dispatcher.build_url(unpack(luci.dispatcher.context.requested.path)) .. "/" .. device end link = s:option(DummyValue, "_link", translate("link")) @@ -124,11 +124,11 @@ function create.write(self, section, value) uci:load("wireless") uci:section("wireless", "wifi-iface", nil, {device=value}) uci:save("wireless") - luci.http.redirect(luci.http.getenv("REQUEST_URI") .. "/" .. value) + luci.http.redirect(luci.dispatcher.build_url(unpack(luci.dispatcher.context.requested.path)) .. "/" .. value) end function create.cbid(self, section) return "priv.cbid.create" end -return m \ No newline at end of file +return m diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua b/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua new file mode 100644 index 000000000..35d8650bf --- /dev/null +++ b/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua @@ -0,0 +1,25 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth +Copyright 2008 Jo-Philipp Wich + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- +m = Map("lucittpd", "LuCIttpd", translate("a_srv_lucittpd")) + +s = m:section(NamedSection, "lucittpd", "lucittpd", "") + +s:option(Value, "port", translate("port")) +s:option(Value, "root", translate("a_srv_http_root")) +s:option(Value, "path", translate("a_srv_http_path")) +s:option(Flag, "keepalive", translate("a_srv_http_keepalive")) +s:option(Value, "timeout", translate("a_srv_http_timeout")) + +return m diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua index b538310aa..acff55aab 100644 --- a/modules/admin-mini/luasrc/controller/mini/index.lua +++ b/modules/admin-mini/luasrc/controller/mini/index.lua @@ -40,6 +40,13 @@ function index() end function action_logout() - luci.http.header("Set-Cookie", "sysauth=; path=/") + local dsp = require "luci.dispatcher" + local sauth = require "luci.sauth" + if dsp.context.authsession then + sauth.kill(dsp.context.authsession) + dsp.context.urltoken.stok = nil + end + + luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url()) luci.http.redirect(luci.dispatcher.build_url()) end \ No newline at end of file diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua index 460ebbec5..533211b00 100644 --- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua @@ -19,6 +19,8 @@ function index() local page = node() page.lock = true page.target = alias("freifunk") + page.subindex = true + page.index = false local page = node("freifunk") page.title = "Freifunk" @@ -27,11 +29,13 @@ function index() page.setuser = "nobody" page.setgroup = "nogroup" page.i18n = "freifunk" + page.index = true local page = node("freifunk", "index") page.target = template("freifunk/index") page.title = "Ãbersicht" page.order = 10 + page.indexignore = true local page = node("freifunk", "index", "contact") page.target = template("freifunk/contact") @@ -39,26 +43,27 @@ function index() local page = node("freifunk", "status") - page.target = call("action_status") + page.target = form("freifunk/public_status") page.title = "Status" page.order = 20 + page.i18n = "admin-core" page.setuser = false page.setgroup = false - assign({"freifunk", "status", "iwscan"}, {"admin", "status", "iwscan"}, "WLAN-Scan", 20) - assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, "OLSR", 30) if luci.fs.isfile("/etc/config/luci_statistics") then - assign({"freifunk", "statistics"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40) + assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40) end - local page = node("admin", "index", "freifunk") + assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 15) + entry({"admin", "freifunk"}, alias("admin", "freifunk", "index"), "Freifunk", 15) + local page = node("admin", "freifunk", "index") page.target = cbi("freifunk/freifunk") page.title = "Freifunk" page.order = 30 - local page = node("admin", "index", "contact") + local page = node("admin", "freifunk", "contact") page.target = cbi("freifunk/contact") page.title = "Kontakt" page.order = 40 diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua index 203b1ce6d..2bb34a14a 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua @@ -11,16 +11,24 @@ You may obtain a copy of the License at $Id$ ]]-- + +luci.i18n.loadc("freifunk") + m = Map("freifunk", translate("contact"), translate("contact1")) c = m:section(NamedSection, "contact", "public", "") -c:option(Value, "nickname", translate("nickname")) -c:option(Value, "name", translate("name")) -c:option(Value, "mail", translate("mail"), translate("mail1")) -c:option(Value, "phone", translate("phone")) -c:option(Value, "location", translate("location")) -c:option(Value, "geo", translate("coord"), translate("coord1")) -c:option(Value, "note", translate("note")) +c:option(Value, "nickname", translate("ff_nickname")) +c:option(Value, "name", translate("ff_name")) +c:option(Value, "mail", translate("ff_mail"), translate("ff_mail1")) +c:option(Value, "phone", translate("ff_phone")) +c:option(Value, "location", translate("ff_location")) +c:option(Value, "note", translate("ff_note")) + +m2 = Map("system", translate("geo")) + +s = m2:section(TypedSection, "system", "") +s:option(Value, "latitude", translate("latitude", "Breite")).rmempty = true +s:option(Value, "longitude", translate("longitude", "LÃ¤nge")).rmempty = true -return m \ No newline at end of file +return m, m2 diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua b/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua index 54d984988..1a147460b 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua @@ -18,14 +18,7 @@ fÃ¼r die lokale Freifunkgemeinschaft. Diese Werte wirken sich NICHT auf die Konf des Routers aus, sondern definieren nur die Vorgaben fÃ¼r den Freifunkassistenten.]]) c:option(Value, "name", "Gemeinschaft") c:option(Value, "homepage", "Webseite") -c:option(Value, "essid", "ESSID") -c:option(Value, "bssid", "BSSID") -c:option(Value, "channel", "Funkkanal") -c:option(Value, "realm", "Realm") -c:option(Value, "net", "Adressbereich") -c:option(Value, "mask", "Netzmaske") -c:option(Value, "dns", "DNS-Server") -c:option(Value, "dhcp", "DHCP-Bereich") -c:option(Value, "dhcpmask", "DHCP-Maske") +c:option(Value, "ssid", "ESSID") +c:option(Value, "prefix", "Netzprefix") return m \ No newline at end of file diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua new file mode 100644 index 000000000..14e6d5664 --- /dev/null +++ b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua @@ -0,0 +1,213 @@ +require "luci.sys" +require "luci.tools.webadmin" + +local bit = require "bit" +local uci = luci.model.uci.cursor_state() + +local ffzone = luci.tools.webadmin.firewall_find_zone("freifunk") +local ffznet = ffzone and uci:get("firewall", ffzone, "network") +local ffwifs = ffznet and luci.util.split(ffznet, " ") or {} + +-- System -- + +f = SimpleForm("system", "System") +f.submit = false +f.reset = false +local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo() +local uptime = luci.sys.uptime() + +f:field(DummyValue, "_system", translate("system")).value = system +f:field(DummyValue, "_cpu", translate("m_i_processor")).value = model + +local load1, load5, load15 = luci.sys.loadavg() +f:field(DummyValue, "_la", translate("load")).value = +string.format("%.2f, %.2f, %.2f", load1, load5, load15) + +f:field(DummyValue, "_memtotal", translate("m_i_memory")).value = +string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)", + tonumber(memtotal) / 1024, + 100 * memcached / memtotal, + translate("mem_cached") or "", + 100 * membuffers / memtotal, + translate("mem_buffered") or "", + 100 * memfree / memtotal, + translate("mem_free") or "") + +f:field(DummyValue, "_systime", translate("m_i_systemtime")).value = +os.date("%c") + +f:field(DummyValue, "_uptime", translate("m_i_uptime")).value = +luci.tools.webadmin.date_format(tonumber(uptime)) + + +-- Wireless -- + +local wireless = uci:get_all("wireless") +local wifidata = luci.sys.wifi.getiwconfig() +local ifaces = {} + +for k, v in pairs(wireless) do + if v[".type"] == "wifi-iface" and luci.util.contains(ffwifs, v.device) then + table.insert(ifaces, v) + end +end + + +m = SimpleForm("wireless", "Freifunk WLAN") +m.submit = false +m.reset = false + +s = m:section(Table, ifaces, translate("networks")) + +link = s:option(DummyValue, "_link", translate("link")) +function link.cfgvalue(self, section) + local ifname = self.map:get(section, "ifname") + return wifidata[ifname] and wifidata[ifname]["Link Quality"] or "-" +end + +essid = s:option(DummyValue, "ssid", "ESSID") + +bssid = s:option(DummyValue, "_bsiid", "BSSID") +function bssid.cfgvalue(self, section) + local ifname = self.map:get(section, "ifname") + return (wifidata[ifname] and (wifidata[ifname].Cell + or wifidata[ifname]["Access Point"])) or "-" +end + +channel = s:option(DummyValue, "channel", translate("channel")) + function channel.cfgvalue(self, section) + return wireless[self.map:get(section, "device")].channel +end + +protocol = s:option(DummyValue, "_mode", translate("protocol")) +function protocol.cfgvalue(self, section) + local mode = wireless[self.map:get(section, "device")].mode + return mode and "802." .. mode +end + +mode = s:option(DummyValue, "mode", translate("mode")) +encryption = s:option(DummyValue, "encryption", translate("iwscan_encr")) + +power = s:option(DummyValue, "_power", translate("power")) +function power.cfgvalue(self, section) + local ifname = self.map:get(section, "ifname") + return wifidata[ifname] and wifidata[ifname]["Tx-Power"] or "-" +end + +scan = s:option(Button, "_scan", translate("scan")) +scan.inputstyle = "find" + +function scan.cfgvalue(self, section) + return self.map:get(section, "ifname") or false +end + +t2 = m:section(Table, {}, translate("iwscan"), translate("iwscan1")) + +function scan.write(self, section) + t2.render = t2._render + local ifname = self.map:get(section, "ifname") + luci.util.update(t2.data, luci.sys.wifi.iwscan(ifname)) +end + +t2._render = t2.render +t2.render = function() end + +t2:option(DummyValue, "Quality", translate("iwscan_link")) +essid = t2:option(DummyValue, "ESSID", "ESSID") +function essid.cfgvalue(self, section) + return luci.util.pcdata(self.map:get(section, "ESSID")) +end + +t2:option(DummyValue, "Address", "BSSID") +t2:option(DummyValue, "Mode", translate("mode")) +chan = t2:option(DummyValue, "channel", translate("channel")) +function chan.cfgvalue(self, section) + return self.map:get(section, "Channel") + or self.map:get(section, "Frequency") + or "-" +end + +t2:option(DummyValue, "Encryption key", translate("iwscan_encr")) + +t2:option(DummyValue, "Signal level", translate("iwscan_signal")) + +t2:option(DummyValue, "Noise level", translate("iwscan_noise")) + + +-- Routes -- +r = SimpleForm("routes", "Standardrouten") +r.submit = false +r.reset = false + +local routes = {} +for i, route in ipairs(luci.sys.net.routes()) do + if route.dest:prefix() == 0 then + routes[#routes+1] = route + end +end + +v = r:section(Table, routes) + +net = v:option(DummyValue, "iface", translate("network")) +function net.cfgvalue(self, section) + return luci.tools.webadmin.iface_get_network(routes[section].device) + or routes[section].device +end + +target = v:option(DummyValue, "target", translate("target")) +function target.cfgvalue(self, section) + return routes[section].dest:network():string() +end + +netmask = v:option(DummyValue, "netmask", translate("netmask")) +function netmask.cfgvalue(self, section) + return routes[section].dest:mask():string() +end + +gateway = v:option(DummyValue, "gateway", translate("gateway")) +function gateway.cfgvalue(self, section) + return routes[section].gateway:string() +end + +metric = v:option(DummyValue, "metric", translate("metric")) +function metric.cfgvalue(self, section) + return routes[section].metric +end + + +local routes6 = {} +for i, route in ipairs(luci.sys.net.routes6() or {}) do + if route.dest:prefix() == 0 then + routes6[#routes6+1] = route + end +end + +if #routes6 > 0 then + v6 = r:section(Table, routes6) + + net = v6:option(DummyValue, "iface", translate("network")) + function net.cfgvalue(self, section) + return luci.tools.webadmin.iface_get_network(routes[section].device) + or routes6[section].device + end + + target = v6:option(DummyValue, "target", translate("target")) + function target.cfgvalue(self, section) + return routes6[section].dest:string() + end + + gateway = v6:option(DummyValue, "gateway6", translate("gateway6")) + function gateway.cfgvalue(self, section) + return routes6[section].source:string() + end + + metric = v6:option(DummyValue, "metric", translate("metric")) + function metric.cfgvalue(self, section) + local metr = routes6[section].metric + local lower = bit.band(metr, 0xffff) + local higher = bit.rshift(bit.band(metr, 0xffff0000), 16) + return "%04X%04X" % {higher, lower} + end +end + +return f, m, r diff --git a/modules/freifunk/luasrc/view/freifunk/index.htm b/modules/freifunk/luasrc/view/freifunk/index.htm index 49e8cd035..0b4d69771 100644 --- a/modules/freifunk/luasrc/view/freifunk/index.htm +++ b/modules/freifunk/luasrc/view/freifunk/index.htm @@ -17,7 +17,7 @@ $Id$

<%:ff_hellonet%> <%=ff.community.name or 'Freifunk Deutschland'%>!

<%:ff_public1%>
<%:ff_public2%> <%=luci.sys.hostname()%>. <%:ff_public3%> - <%=ff.contact.nickname%>.

+"> <%=ff.contact.nickname%>.

<%:ff_public4%> Freifunk.net.
<%:ff_public5%> <%=ff.community.name or 'Freifunk'%>.

<%:ff_note%>: <%:ff_public6%>

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk index 99521225c..0391e6076 100644 --- a/modules/freifunk/root/etc/config/freifunk +++ b/modules/freifunk/root/etc/config/freifunk @@ -1,32 +1,28 @@ +config settings wizard config public contact - option nickname - option name - option mail - option phone - option location - option geo - option note + option nickname '' + option name '' + option mail '' + option phone '' + option location '' + option note '' config public community - option name "Freifunk Halle" - option homepage http://halle.freifunk.net - option realm netz.freifunk-halle.net - -config settings wizard - + option name 'Freifunk' + option homepage 'http://freifunk.net' config fw_rule http option src freifunk option target ACCEPT option proto tcp option dest_port 80 - + config fw_rule https option src freifunk option target ACCEPT option proto tcp option dest_port 443 - + config fw_rule ssh option src freifunk option target ACCEPT @@ -38,31 +34,33 @@ config fw_rule olsr option target ACCEPT option proto udp option dest_port 698 - + config fw_forwarding lan option src lan option dest freifunk - +config fw_forwarding fffwd + option src freifunk + option dest freifunk + config defaults wifi_device option channel 1 option txantenna 1 option rxantenna 1 - option txant 1 - option rxant 1 option diversity 0 - + option disabled 0 + config defaults wifi_iface - option type adhoc - option essid halle.freifunk.net + option mode adhoc option bssid 02:CA:FF:EE:BA:BE option txpower 10 - option rts 0 - option frag 0 - - + option rts 2346 + option frag 512 + option sw_merge 1 + + config defaults interface option netmask 255.0.0.0 option dns "88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222" @@ -70,12 +68,12 @@ config defaults interface config defaults alias option netmask 255.255.255.0 - - + + config defaults dhcp option leasetime 30m - - + + config defaults olsr_interface option HelloInterval 6.0 option HelloValidityTime 108.0 @@ -84,4 +82,44 @@ config defaults olsr_interface option MidInterval 18.0 option MidValidityTime 324.0 option HnaInterval 18.0 - option HnaValidityTime 108.0 \ No newline at end of file + option HnaValidityTime 108.0 + + +config community leipzig + option name "Freifunk Leipzig" + option homepage http://leipzig.freifunk.net + option ssid "leipzig.freifunk.net" + option prefix "104.61" + +config community halle + option name "Freifunk Halle" + option homepage http://halle.freifunk.net + option ssid "halle.freifunk.net" + option prefix "104.62" + +config community l59 + option name "Freifunk L59" + option homepage http://freifunk.net + option ssid "start.freifunk.net" + option prefix "104.59" + +config community berlin + option name "Freifunk Berlin" + option homepage http://berlin.freifunk.net + option ssid "olsr.freifunk.net" + option prefix "104" + option external freifunk_berlin + +config community hannover + option name "Freifunk Hannover" + option homepage http://hannover.freifunk.net + option ssid "hannover.freifunk.net" + option prefix "10.2" + option external freifunk_hannover + +config community augsburg + option name "Freifunk Augsburg" + option homepage http://augsburg.freifunk.net + option ssid "augsburg.freifunk.net" + option prefix "191.161" + option external freifunk_augsburg diff --git a/modules/freifunk/root/etc/config/freifunk_augsburg b/modules/freifunk/root/etc/config/freifunk_augsburg new file mode 100644 index 000000000..f68600c26 --- /dev/null +++ b/modules/freifunk/root/etc/config/freifunk_augsburg @@ -0,0 +1,2 @@ +config defaults interface + option netmask 255.255.0.0 \ No newline at end of file diff --git a/modules/freifunk/root/etc/config/freifunk_berlin b/modules/freifunk/root/etc/config/freifunk_berlin new file mode 100644 index 000000000..65bde7666 --- /dev/null +++ b/modules/freifunk/root/etc/config/freifunk_berlin @@ -0,0 +1,2 @@ +config defaults wifi_device + option channel 10 \ No newline at end of file diff --git a/modules/freifunk/root/etc/config/freifunk_hannover b/modules/freifunk/root/etc/config/freifunk_hannover new file mode 100644 index 000000000..f797a938f --- /dev/null +++ b/modules/freifunk/root/etc/config/freifunk_hannover @@ -0,0 +1,5 @@ +config defaults wifi_iface + option bssid CA:FF:EE:CA:FF:EE + +config defaults interface + option netmask 255.255.0.0 \ No newline at end of file diff --git a/modules/rpc/luasrc/controller/rpc.lua b/modules/rpc/luasrc/controller/rpc.lua index 2eef7a0eb..e0aeb3bf0 100644 --- a/modules/rpc/luasrc/controller/rpc.lua +++ b/modules/rpc/luasrc/controller/rpc.lua @@ -25,7 +25,8 @@ function index() local function authenticator(validator, accs) local auth = luci.http.formvalue("auth", true) if auth then - local user = luci.sauth.read(auth) + local sdat = luci.sauth.read(auth) + user = loadstring(sdat)().user if user and luci.util.contains(accs, user) then return user, auth end @@ -52,20 +53,33 @@ function rpc_auth() local http = require "luci.http" local sys = require "luci.sys" local ltn12 = require "luci.ltn12" + local util = require "luci.util" local loginstat local server = {} - server.login = function(user, pass) - local sid - + server.challenge = function(user, pass) + local sid, token, secret + if sys.user.checkpasswd(user, pass) then sid = sys.uniqueid(16) + token = sys.uniqueid(16) + secret = sys.uniqueid(16) + http.header("Set-Cookie", "sysauth=" .. sid.."; path=/") - sauth.write(sid, user) + sauth.write(sid, util.get_bytecode({ + user=user, + token=token, + secret=secret + })) end - return sid + return sid and {sid=sid, token=token, secret=secret} + end + + server.login = function(...) + local challenge = server.challenge(...) + return challenge and challenge.sid end http.prepare_content("application/json") diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css index 9940b09ac..8aea90999 100644 --- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css +++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css @@ -371,19 +371,12 @@ textarea#syslog { font-style: italic; font-family: Trebuchet MS, Verdana, sans-serif; color: #27408B; - background: url('../resources/cbi/arrow.gif') left no-repeat; - padding-left: 17px; } #maincontent p { margin-bottom: 1em; } -#auth_buttons { - float: right; - padding-top: 0.5em; -} - .cbi-section { margin-bottom: 0.5em; padding: 0.5em 1em;