agoo 2.15.2 → 2.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad246b7aa0e634eff81c6c9bdec4d3567115a3beb8b6c237e25f87215fc2dbe3
-  data.tar.gz: 03b6217fd351024938607dd036dcfd437a0dd967b22eca2b51aa0ed8a041d969
+  metadata.gz: 198dedaa66484abc8e37d6eb0ed4dcafb8ca02c2a55dc22c64c276368133e3b7
+  data.tar.gz: 37bdd47c51df1bdda5455363cbde76953ea508ec36183c0d88658e4d6f68defc
 SHA512:
-  metadata.gz: a244ea77e0f13688e2e6237c31eb320af4c0eeb9780f6023ef6337db7f64839ce543a27d5890155fb0908f0ce6567733b750be0d7b7c4de246430c54a736b6f4
-  data.tar.gz: abf7f274c15852b21b64ac6018b03264d08968902b9ad71d4f56d84a5ea34cf018b5e26daf6bde44f7f748da57a889c373435658cfb085ff537f3a683433c6d3
+  metadata.gz: 251b917392fe0b1e3d8ce11c92e713350eda58d3a28ee6eaa3ba67fbecaf6174aa7f76d50fe70b6b69e02711bde4f185bbcf698feab0d89c89f269066ec63986
+  data.tar.gz: 532befc3ea42c1d0aae87c4b8ee5f06a4973948bad456beb162edec702cbf49c84f4dbe39a9af5aa46bfc70e49026d7a9b44aa0e9b29e74286fa0f8cbadb34af

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All changes to the Agoo gem are documented here. Releases follow semantic versioning.
 
+## [2.15.3] - 2022-09-23
+
+### Fixed
+
+- Asset names with spaces or special characters are now loaded correctly.
+
 ## [2.15.2] - 2022-06-21
 
 ### Fixed

data/ext/agoo/page.c

@@ -110,6 +110,16 @@ static struct _mime	mime_map[] = {
 
 static const char	page_fmt[] = "HTTP/1.1 200 OK\r\nContent-Type: %s\r\nContent-Length: %ld\r\n\r\n";
 static const char	page_min_fmt[] = "HTTP/1.1 200 OK\r\nContent-Length: %ld\r\n";
+// 0123456789abcdef0123456789abcdef
+static const char hex_map[] = "\
+................................\
+................\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09......\
+.\x0a\x0b\x0c\x0d\x0e\x0f.........................\
+.\x0a\x0b\x0c\x0d\x0e\x0f.........................\
+................................\
+................................\
+................................\
+................................";
 
 static struct _cache	cache = {
     .buckets = {0},
@@ -120,29 +130,35 @@ static struct _cache	cache = {
     .head_rules = NULL,
 };
 
+static char
+parse_percent_seq(const char *seq) {
+    const char  *end = seq + 2;
+    uint8_t        h;
+    uint8_t        b = 0;
+
+    for (; seq < end; seq++) {
+        if (16 < (h = hex_map[(uint8_t)*seq])) {
+            return '?';
+        }
+        b = (b << 4) | h;
+    }
+    return (char)b;
+}
+
 static uint64_t
 calc_hash(const char *key, int *lenp) {
     int			len = 0;
     int			klen = *lenp;
     uint64_t		h = 0;
-    bool		special = false;
     const uint8_t	*k = (const uint8_t*)key;
 
     for (; len < klen; k++) {
-	// narrow to most used range of 0x4D (77) in size
-	if (*k < 0x2D || 0x7A < *k) {
-	    special = true;
-	}
 	// fast, just spread it out
 	h = 77 * h + (*k - 0x2D);
 	len++;
     }
+    *lenp = len;
 
-    if (special) {
-	*lenp = -len;
-    } else {
-	*lenp = len;
-    }
     return h;
 }
 
@@ -790,9 +806,25 @@ agoo_page_get(agooErr err, const char *path, int plen, const char *root) {
 	if ('/' != *root && '/' != *(s - 1) && '/' != *path) {
 	    *s++ = '/';
 	}
-	strncpy(s, path, plen);
-	s[plen] = '\0';
-
+        // TBD if path has % then ...
+        if (NULL != memchr(path, '%', plen)) {
+            const char  *pend = path + plen;
+            const char  *pp = path;
+
+            for (; pp < pend; pp++) {
+                if ('%' != *pp) {
+                    *s++ = *pp;
+                    continue;
+                }
+                *s++ = parse_percent_seq(pp+1);
+                pp += 2;
+            }
+        } else {
+            strncpy(s, path, plen);
+            s += plen;
+        }
+	*s = '\0';
+        plen = (int)(s - full_path);
 	if (NULL == (page = cache_root_get(full_path, plen))) {
 	    if (NULL != cache.root) {
 		agooPage	old;
@@ -815,10 +847,12 @@ agoo_page_get(agooErr err, const char *path, int plen, const char *root) {
 	}
     } else {
 	if (NULL == (page = cache_get(path, plen))) {
-	    if (NULL != cache.root) {
+            bool        has_percent = NULL != memchr(path, '%', plen);
+
+	    if (NULL != cache.root || has_percent) {
 		agooPage	old;
-		char	full_path[2048];
-		char	*s = stpcpy(full_path, cache.root);
+		char	        full_path[2048];
+		char	        *s = stpcpy(full_path, cache.root);
 
 		if ('/' != *cache.root && '/' != *path) {
 		    *s++ = '/';
@@ -827,17 +861,34 @@ agoo_page_get(agooErr err, const char *path, int plen, const char *root) {
 		    AGOO_ERR_MEM(err, "Page path");
 		    return NULL;
 		}
-		strncpy(s, path, plen);
-		s[plen] = '\0';
-		if (NULL == (page = agoo_page_create(full_path))) {
+                if (has_percent) {
+                    const char  *pend = path + plen;
+                    const char  *pp = path;
+
+                    for (; pp < pend; pp++) {
+                        if ('%' != *pp) {
+                            *s++ = *pp;
+                            continue;
+                        }
+                        *s++ = parse_percent_seq(pp+1);
+                        pp += 2;
+                    }
+                    *s = '\0';
+                } else {
+                    strncpy(s, path, plen);
+                    s[plen] = '\0';
+                }
+		if (NULL == (page = agoo_page_create(full_path))) { // TBD full_path or original path?
 		    AGOO_ERR_MEM(err, "Page");
 		    return NULL;
 		}
+                plen = (int)strlen(full_path);
 		if (!update_contents(page) || NULL == page->resp) {
 		    agoo_page_destroy(page);
 		    agoo_err_set(err, AGOO_ERR_NOT_FOUND, "not found.");
 		    return NULL;
 		}
+                // Cache key is the original path/plen.
 		if (NULL != (old = cache_set(path, plen, page))) {
 		    agoo_page_destroy(old);
 		}

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.15.2'
+  VERSION = '2.15.3'
 end

data/test/static_test.rb

@@ -69,6 +69,25 @@ class StaticTest < Minitest::Test
     assert_equal(expect, content)
   end
 
+  def test_fetch_space_name
+    uri = URI('http://localhost:6469/space%20in%20name.html')
+    expect = %|<!DOCTYPE html>
+<html>
+  <head><title>Agoo Space Test</title></head>
+  <body>Agoo</body>
+</html>
+|
+    req = Net::HTTP::Get.new(uri)
+    req['Accept-Encoding'] = '*'
+    req['User-Agent'] = 'Ruby'
+    res = Net::HTTP.start(uri.hostname, uri.port) { |h|
+      h.request(req)
+    }
+    content = res.body
+    assert_equal('text/html', res['Content-Type'])
+    assert_equal(expect, content)
+  end
+
   def test_mime
     uri = URI('http://localhost:6469/odd.odd')
     req = Net::HTTP::Get.new(uri)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.15.2
+  version: 2.15.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj