iodine 0.7.45 → 0.7.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33f22236ecbf1c2166c056476bbefb6ab80b709cdb6cc16c0ec144926cf3fdc0
-  data.tar.gz: 6b0c70cc71431eb3611d34af45c80f679c0177141843a5e03b1cdb6b242d4f19
+  metadata.gz: 1718fc25cba1ab9a96c643a16e34413067b30b6706659ca77becf907a92bafe6
+  data.tar.gz: 1b3fc0945e54e6eedf7e1fa27956cecfe46e80c8a43078f305343a9eb3497f50
 SHA512:
-  metadata.gz: 3506324c77f3de50b9dda515922c3468bbb49c63cd58831d2f7711e02b28209ba7fb5d15e076e860092be4d783cf595fd69b2483bf7ee59b873040005468161f
-  data.tar.gz: 7c4b0ffb76c749c11f18d66faaad5494e6ab7c675b0d887721de3c7494a7b764886bb8b7b4f5fc369e606e0f3b2e30172818dae27faa4c3cfffa73d094012cf9
+  metadata.gz: 70945896acf5a4497254bd631bcc427bde4051813c65d44d43567c0283a40c61a1ecefa547985ee481981a21e4bcf4d3380076fbc5816eed2fdc06a487553e64
+  data.tar.gz: bfba77e38f598db62a893ad356ad40485a9dfc768355357bc8242227991ecf8c24354f2f30e52d3afcf1d8f1c62b0fec15c7a2baec309c5b29d6b042918ff259

data/CHANGELOG.md

@@ -6,6 +6,18 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.0.7.48 (2022-06-28)
+
+**Fix**: Fixes an issue with `pong` WebSocket frames when a client sends a WebSocket `ping`. Credit to Lucas Kuan (@lucaskuan) for finding this issue and for PR #124.
+
+#### Change log v.0.7.47 (2022-05-11)
+
+**Fix**: Fixes an issue that causes `Rack::Lint` to complain about `SERVER_PORT` being an empty string. Credit to @adam12 (Adam Daniels) for PR #108 and issue #107.
+
+#### Change log v.0.7.46 (2022-05-06)
+
+**Fix**: Fixes the (erroneous) default insertion of the `last-modified` header in order to both better express the intent of RFC 2616 and prevent conflict with the `Rack::ETag` middleware. Credit to @raxoft (Patrik Rak) for opening issue #122.
+
 #### Change log v.0.7.45 (2021-11-26)
 
 **Security**: Fixes a number of issues with the HTTP parser that could have been leveraged in potential exploit attempts such as request smuggling. Credit to @dcepelik (David Čepelík).

data/examples/etag.ru

@@ -0,0 +1,16 @@
+# This example uses Rack::ETag to allow for response caching.
+
+require 'rack'
+require 'iodine'
+
+App = Proc.new do |env|
+   [200,
+     {   "Content-Type" => "text/html".freeze,
+         "Content-Length" => "16".freeze },
+     ['Hello from Rack!'.freeze]  ]
+end
+
+use Rack::ConditionalGet
+use Rack::ETag, 'public'
+
+run App

data/ext/iodine/http.c

@@ -92,14 +92,12 @@ static inline void add_date(http_s *r) {
   static uint64_t date_hash = 0;
   if (!date_hash)
     date_hash = fiobj_hash_string("date", 4);
-  static uint64_t mod_hash = 0;
-  if (!mod_hash)
-    mod_hash = fiobj_hash_string("last-modified", 13);
 
   if (fio_last_tick().tv_sec > last_date_added) {
     fio_lock(&date_lock);
     if (fio_last_tick().tv_sec > last_date_added) { /* retest inside lock */
-      /* 32 chars are ok for a while, but http_time2str below has a buffer sized 48 chars and does a memcpy ... */
+      /* 32 chars are ok for a while, but http_time2str below has a buffer sized
+       * 48 chars and does a memcpy ... */
       FIOBJ tmp = fiobj_str_buf(32);
       FIOBJ old = current_date;
       fiobj_str_resize(
@@ -115,11 +113,6 @@ static inline void add_date(http_s *r) {
     fiobj_hash_set(r->private_data.out_headers, HTTP_HEADER_DATE,
                    fiobj_dup(current_date));
   }
-  if (r->status_str == FIOBJ_INVALID &&
-      !fiobj_hash_get2(r->private_data.out_headers, mod_hash)) {
-    fiobj_hash_set(r->private_data.out_headers, HTTP_HEADER_LAST_MODIFIED,
-                   fiobj_dup(current_date));
-  }
 }
 
 struct header_writer_s {
@@ -2355,7 +2348,7 @@ static void init_cached_key_ptr(void) {
   time_t *cached_tick = malloc(sizeof(time_t));
   FIO_ASSERT_ALLOC(cached_tick);
   memset(cached_tick, 0, sizeof(time_t));
-  char *cached_httpdate = malloc(sizeof(char)*48);
+  char *cached_httpdate = malloc(sizeof(char) * 48);
   FIO_ASSERT_ALLOC(cached_tick);
   memset(cached_httpdate, 0, 48);
   size_t *cached_len = malloc(sizeof(size_t));
@@ -2401,28 +2394,24 @@ size_t http_time2str(char *target, const time_t t) {
 
 /* Credit to Jonathan Leffler for the idea of a unified conditional */
 #define hex_val(c)                                                             \
-  (((c) >= '0' && (c) <= '9')                                                  \
-       ? ((c)-48)                                                              \
-       : (((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))            \
-             ? (((c) | 32) - 87)                                               \
-             : ({                                                              \
-                 return -1;                                                    \
-                 0;                                                            \
-               }))
+  (((c) >= '0' && (c) <= '9')                 ? ((c)-48)                       \
+   : (((c) | 32) >= 'a' && ((c) | 32) <= 'f') ? (((c) | 32) - 87)              \
+                                              : ({                             \
+                                                  return -1;                   \
+                                                  0;                           \
+                                                }))
 static inline int hex2byte(uint8_t *dest, const uint8_t *source) {
   if (source[0] >= '0' && source[0] <= '9')
     *dest = (source[0] - '0');
-  else if ((source[0] >= 'a' && source[0] <= 'f') ||
-           (source[0] >= 'A' && source[0] <= 'F'))
-    *dest = (source[0] | 32) - 87;
+  else if ((source[0] | 32) >= 'a' && (source[0] | 32) <= 'f')
+    *dest = (source[0] | 32) - ('a' - 10);
   else
     return -1;
   *dest <<= 4;
   if (source[1] >= '0' && source[1] <= '9')
     *dest |= (source[1] - '0');
-  else if ((source[1] >= 'a' && source[1] <= 'f') ||
-           (source[1] >= 'A' && source[1] <= 'F'))
-    *dest |= (source[1] | 32) - 87;
+  else if ((source[1] | 32) >= 'a' && (source[1] | 32) <= 'f')
+    *dest |= (source[1] | 32) - ('a' - 10);
   else
     return -1;
   return 0;
@@ -2561,9 +2550,7 @@ FIOBJ http_mimetype_find(char *file_ext, size_t file_ext_len) {
 
 static pthread_key_t buffer_key;
 static pthread_once_t buffer_once = PTHREAD_ONCE_INIT;
-static void init_buffer_key(void) {
-  pthread_key_create(&buffer_key, free);
-}
+static void init_buffer_key(void) { pthread_key_create(&buffer_key, free); }
 static void init_buffer_ptr(void) {
   char *buffer = malloc(sizeof(char) * (LONGEST_FILE_EXTENSION_LENGTH + 1));
   FIO_ASSERT_ALLOC(buffer);

data/ext/iodine/iodine_http.c

@@ -369,7 +369,6 @@ static inline VALUE copy2env(iodine_http_request_handle_s *handle) {
   if (*pos == 0) {
     rb_hash_aset(env, SERVER_NAME,
                  rb_enc_str_new(tmp.data, tmp.len, IodineBinaryEncoding));
-    rb_hash_aset(env, SERVER_PORT, QUERY_ESTRING);
   } else {
     rb_hash_aset(
         env, SERVER_NAME,
@@ -869,7 +868,6 @@ static void initialize_env_template(void) {
   rb_hash_aset(env_template_no_upgrade, REMOTE_ADDR, QUERY_STRING);
   rb_hash_aset(env_template_no_upgrade, REQUEST_METHOD, QUERY_STRING);
   rb_hash_aset(env_template_no_upgrade, SERVER_NAME, QUERY_STRING);
-  rb_hash_aset(env_template_no_upgrade, SERVER_PORT, QUERY_ESTRING);
   rb_hash_aset(env_template_no_upgrade, SERVER_PROTOCOL, QUERY_STRING);
 
   /* WebSocket upgrade support */

data/ext/iodine/iodine_rack_io.c

@@ -72,11 +72,7 @@ static rb_encoding *IodineBinaryEncoding;
 
 inline static http_s *get_handle(VALUE obj) {
   VALUE i = rb_ivar_get(obj, iodine_fd_var_id);
-#ifdef __MINGW32__
   return (http_s *)NUM2ULL(i);
-#else
-  return (http_s *)FIX2ULONG(i);
-#endif
 }
 
 /* *****************************************************************************
@@ -85,11 +81,7 @@ IO API
 
 static inline FIOBJ get_data(VALUE self) {
   VALUE i = rb_ivar_get(self, io_id);
-#ifdef __MINGW32__
   return (FIOBJ)NUM2ULL(i);
-#else
-  return (FIOBJ)FIX2ULONG(i);
-#endif
 }
 
 static VALUE rio_rewind(VALUE self) {

data/ext/iodine/websockets.c

@@ -28,7 +28,8 @@ Feel free to copy, use and enjoy according to the license provided.
 
 #include <websocket_parser.h>
 
-#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) && !defined(__MINGW32__)
+#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) &&                 \
+    !defined(__MINGW32__)
 #include <endian.h>
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) &&                 \
     __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -183,15 +184,19 @@ static void websocket_on_protocol_ping(void *ws_p, void *msg_, uint64_t len) {
     fio_write2(ws->fd, .data.buffer = buff, .length = len);
   } else {
     if (((ws_s *)ws)->is_client) {
-      fio_write2(ws->fd, .data.buffer = "\x89\x80mask", .length = 2,
+      fio_write2(ws->fd, .data.buffer = "\x8a\x80mask", .length = 6,
                  .after.dealloc = FIO_DEALLOC_NOOP);
     } else {
-      fio_write2(ws->fd, .data.buffer = "\x89\x00", .length = 2,
+      fio_write2(ws->fd, .data.buffer = "\x8a\x00", .length = 2,
                  .after.dealloc = FIO_DEALLOC_NOOP);
     }
   }
+  FIO_LOG_DEBUG("Received ping and sent pong for Websocket %p (%d)", ws_p,
+                (int)(((ws_s *)ws_p)->fd));
 }
 static void websocket_on_protocol_pong(void *ws_p, void *msg, uint64_t len) {
+  FIO_LOG_DEBUG("Received pong for Websocket %p (%d)", ws_p,
+                (int)(((ws_s *)ws_p)->fd));
   (void)len;
   (void)msg;
   (void)ws_p;
@@ -220,6 +225,7 @@ static void ws_ping(intptr_t fd, fio_protocol_s *ws) {
     fio_write2(fd, .data.buffer = "\x89\x00", .length = 2,
                .after.dealloc = FIO_DEALLOC_NOOP);
   }
+  FIO_LOG_DEBUG("Sent ping for Websocket %p (%d)", (void *)ws, (int)fd);
 }
 
 static void on_close(intptr_t uuid, fio_protocol_s *_ws) {
@@ -238,10 +244,10 @@ static uint8_t on_shutdown(intptr_t fd, fio_protocol_s *ws) {
   if (ws && ((ws_s *)ws)->on_shutdown)
     ((ws_s *)ws)->on_shutdown((ws_s *)ws);
   if (((ws_s *)ws)->is_client) {
-    fio_write2(fd, .data.buffer = "\x8a\x80MASK", .length = 6,
+    fio_write2(fd, .data.buffer = "\x88\x80MASK", .length = 6,
                .after.dealloc = FIO_DEALLOC_NOOP);
   } else {
-    fio_write2(fd, .data.buffer = "\x8a\x00", .length = 2,
+    fio_write2(fd, .data.buffer = "\x88\x00", .length = 2,
                .after.dealloc = FIO_DEALLOC_NOOP);
   }
   return 0;
@@ -728,8 +734,13 @@ int websocket_write(ws_s *ws, fio_str_info_s msg, uint8_t is_text) {
 }
 /** Closes a websocket connection. */
 void websocket_close(ws_s *ws) {
-  fio_write2(ws->fd, .data.buffer = "\x88\x00", .length = 2,
-             .after.dealloc = FIO_DEALLOC_NOOP);
+  if (ws->is_client) {
+    fio_write2(ws->fd, .data.buffer = "\x88\x80MASK", .length = 6,
+               .after.dealloc = FIO_DEALLOC_NOOP);
+  } else {
+    fio_write2(ws->fd, .data.buffer = "\x88\x00", .length = 2,
+               .after.dealloc = FIO_DEALLOC_NOOP);
+  }
   fio_close(ws->fd);
   return;
 }

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.45'.freeze
+  VERSION = '0.7.48'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.45
+  version: 0.7.48
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -145,6 +145,7 @@ files:
 - examples/async_task.ru
 - examples/config.ru
 - examples/echo.ru
+- examples/etag.ru
 - examples/hello.ru
 - examples/pubsub_engine.ru
 - examples/redis.ru
@@ -244,7 +245,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: |-
-  Thank you for installing Iodine 0.7.45.
+  Thank you for installing Iodine 0.7.48.
   Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations).
 rdoc_options: []
 require_paths:
@@ -267,7 +268,7 @@ requirements:
 - Ruby >= 2.5.0 recommended.
 - TLS requires OpenSSL >= 1.1.0.
 - Or Windows with Ruby >= 3.0.0 build with MingW and MingW as compiler.
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for