-Added base64_encode() function to lib/base64.c. Required by the new cachemgr.cgi.

diff --git a/ChangeLog b/ChangeLog
index 39d19ea56f561990b0036fbccc2c3dcc900b86c3..8aac6bcf8d088c6d1185123ad998da386dfc27a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,33 @@
 Future/Current Changes to squid-1.2.beta16 (Feb 23, 1998):
 
-       - Added "basic" authentication scheme for Cache Manager interface.
-         Tested with Netscape 3.01. When a password protected function is
-         accessed, Squid sends an HTTP_UNAUTHORIZED reply, and the browser
-         prompts the user for "user name" and "password" for the specified
-         action. The user name is currently used for logging purposes only.
-         The password is verified against must be an appropriate
-         "cachemgr_passwd" entry from squid.conf. Note that Netscape will
-         cache your authentication info and will reuse it for future
-         accesses. Caching is done on per-realm (per-action) basis, but
-         Netscape may try to use information from other realms when new realm
-         is accessed.  The old interface (appending @password to the url)
-         is still supported but discouraged.
+       - Cache Manager got new Web interface (cachemgr.cgi). New .cgi script
+         forwards basic authentication from browser to squid. Authentication
+         info is encoded within all dynamically generated pages so you do not
+         have to type your password often. Authentication records expire
+         after 3 hours (default) since last use. Cachemgr.cgi now recognizes
+         "action protection" types described below.
+
+       - Added better recognition of available protection for actions in
+         Cache Manager. Actions are classified as "public" (no password
+         needed), "protected" (must specify a valid password), "disabled"
+         (those with a "disable" password in squid.conf), and "hidden"
+         (actions that require a password, but do not have corresponding
+         cachemgr_passwd entry). If you manage to request a hidden, disabled,
+         or unknown action, squid replies with "Invalid URL" message. If a
+         password is needed, and you failed to provide one, squid replies
+         with "Access Denied" message and asks you to authenticate yourself.
+
+       - Added "basic" authentication scheme for the Cache Manager.  When a
+         password protected function is accessed, Squid sends an
+         HTTP_UNAUTHORIZED reply allowing the client to authorize itself by
+         specifying "name" and "password" for the specified action. The user
+         name is currently used for logging purposes only.  The password must
+         be an appropriate "cachemgr_passwd" entry from squid.conf. The old
+         interface (appending @password to the url) is still supported but
+         discouraged.  Note: it is not possible to pass authentication
+         information between squid and browser *via a web server*. The server
+         will strip all authentication headers coming from the browser. A
+         similar problem exists for Proxy-Authentication scheme.
 
        - Added ERR_CACHE_MGR_ACCESS_DENIED page to notify of authentication
          failures when accessing Cache Manager.

diff --git a/include/util.h b/include/util.h
index 4a4b53aa24deb077490d02d8fc9ac7f657b15c31..c77f0b806c0abffd426ffb643aa2e3beeaebfd7b 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.40 1998/02/21 00:56:36 rousskov Exp $
+ * $Id: util.h,v 1.41 1998/02/23 13:04:40 rousskov Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -172,6 +172,7 @@ typedef struct in_addr SIA;
 extern int safe_inet_addr(const char *, SIA *);
 extern time_t parse_iso3307_time(const char *buf);
 extern char *base64_decode(const char *coded);
+extern const char *base64_encode(const char *decoded);
 
 typedef struct _String {
     char *buf;

diff --git a/lib/base64.c b/lib/base64.c
index 89dc02e9b5c22f1ecb9a645e173dee6fdd994cb9..02cfe085fbc76b2c295dcba64513325a6ba9ec8e 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -14,6 +14,7 @@ static int base64_initialized = 0;
 int base64_value[256];
 const char base64_code[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
+
 static void
 base64_init(void)
 {
@@ -62,3 +63,49 @@ base64_decode(const char *p)
     *d = 0;
     return *result ? result : NULL;
 }
+
+/* adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c with adjustments */
+const char *
+base64_encode(const char *decoded_str)
+{
+    static char result[8192];
+    int bits = 0;
+    int char_count = 0;
+    int out_cnt = 0;
+    int c;
+
+    if (!decoded_str)
+       return decoded_str;
+
+    if (!base64_initialized)
+       base64_init();
+
+    while ((c = *decoded_str++) && out_cnt < sizeof(result)-1) {
+        bits += c;
+        char_count++;
+        if (char_count == 3) {
+            result[out_cnt++] = base64_code[bits >> 18];
+            result[out_cnt++] = base64_code[(bits >> 12) & 0x3f];
+            result[out_cnt++] = base64_code[(bits >> 6) & 0x3f];
+            result[out_cnt++] = base64_code[bits & 0x3f];
+            bits = 0;
+            char_count = 0;
+       } else {
+            bits <<= 8;
+       }
+    }
+    if (char_count != 0) {
+        bits <<= 16 - (8 * char_count);
+        result[out_cnt++] = base64_code[bits >> 18];
+        result[out_cnt++] = base64_code[(bits >> 12) & 0x3f];
+        if (char_count == 1) {
+            result[out_cnt++] = '=';
+            result[out_cnt++] = '=';
+       } else {
+            result[out_cnt++] = base64_code[(bits >> 6) & 0x3f];
+            result[out_cnt++] = '=';
+       }
+    }
+    result[out_cnt] = '\0'; /* terminate */
+    return result;
+}