syntropy 0.32.0 → 0.33.0

data/lib/syntropy/request.rb

@@ -3,6 +3,7 @@
 require_relative './request/request_info'
 require_relative './request/validation'
 require_relative './request/response'
+require_relative './request/session'
 require_relative './http/status'
 
 module Syntropy
@@ -95,5 +96,13 @@ module Syntropy
     def total_transfer
       (headers[':rx'] || 0) + (headers[':tx'] || 0)
     end
+
+    def session
+      @session ||= Session.new(self)
+    end
+
+    def flash
+      session.flash
+    end
   end
 end

data/lib/syntropy/test.rb

@@ -3,8 +3,80 @@
 require 'syntropy'
 require 'syntropy/request/mock_adapter'
 require 'minitest'
+require 'json'
+require 'uri'
 
 module Syntropy
+  class Test < Minitest::Test
+    HTTP = Syntropy::HTTP
+
+    def self.env=(env)
+      @@env = env
+    end
+
+    attr_reader :machine, :app
+
+    def env
+      @@env
+    end
+
+    def load_module(ref)
+      app.module_loader.load(ref)
+    end
+
+    def http_request(headers, body = nil)
+      @test_harness.request(headers, body)
+    end
+
+    def get(path, **headers)
+      http_request(
+        headers.merge(
+          ':method' => 'GET',
+          ':path'   => path
+        )
+      )
+    end
+
+    def post(path, content_type, body, **headers)
+      headers = headers.merge('content-type' => content_type) if content_type
+      http_request(
+        headers.merge(
+          {
+            ':method' => 'POST',
+            ':path'   => path
+          }
+        ),
+        body
+      )
+    end
+
+    def post_json(path, obj, **)
+      post(path, 'application/json', JSON.dump(obj), **)
+    end
+
+    def post_form(path, form, **)
+      post(path, 'application/x-www-form-urlencoded', URI.encode_www_form(form), **)
+    end
+
+    def setup
+      raise 'Environment not set' if !@@env
+
+      @machine = UM.new
+      @app = Syntropy::App.new(
+        root_dir: @@env[:root_dir],
+        mount_path: '/',
+        machine: @machine
+      )
+      @test_harness = Syntropy::TestHarness.new(@app)
+    end
+
+    def teardown
+      @machine = nil
+      @app = nil
+      @test_harness = nil
+    end
+  end
+
   class TestHarness
     def initialize(app)
       @app = app
@@ -28,7 +100,6 @@ module Syntropy
       end
     end
 
-
     private
 
     def mock_req(headers, body = nil)

data/lib/syntropy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Syntropy
-  VERSION = '0.32.0'
+  VERSION = '0.33.0'
 end

data/syntropy.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'uringmachine',  '~>1.0.2'
 
   s.add_dependency 'json'
+  s.add_dependency 'base64'
   s.add_dependency 'logger'
   s.add_dependency 'irb'
 

data/test/test_http_server_connection.rb

@@ -596,7 +596,7 @@ class HTTPServerConnectionTest < Minitest::Test
 
   def test_set_cookie_single
     @hook = ->(req) {
-      req.set_cookie('foo=bar; HttpOnly')
+      req.set_cookie('foo', 'bar; HttpOnly')
       req.respond('foo')
     }
 
@@ -610,7 +610,8 @@ class HTTPServerConnectionTest < Minitest::Test
 
   def test_set_cookie_multi1
     @hook = ->(req) {
-      req.set_cookie('foo=bar; HttpOnly', 'bar=baz')
+      req.set_cookie('foo', 'bar; HttpOnly')
+      req.set_cookie('bar', 'baz')
       req.respond('foo')
     }
 
@@ -624,9 +625,11 @@ class HTTPServerConnectionTest < Minitest::Test
 
   def test_set_cookie_multi2
     @hook = ->(req) {
-      req.set_cookie('a=1', 'b=2')
-      req.set_cookie('c=3')
-      req.set_cookie('d=4', 'e=5')
+      req.set_cookie('a', '1')
+      req.set_cookie('b', '2')
+      req.set_cookie('c', '3')
+      req.set_cookie('d', '4')
+      req.set_cookie('e', '5')
       req.respond('foo')
     }
 

data/test/test_request_session.rb

@@ -0,0 +1,254 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class RequestSessionTest < Minitest::Test
+  def make_socket_pair
+    port = SecureRandom.random_number(10000..40000)
+    server_fd = @machine.socket(UM::AF_INET, UM::SOCK_STREAM, 0, 0)
+    @machine.setsockopt(server_fd, UM::SOL_SOCKET, UM::SO_REUSEADDR, true)
+    @machine.bind(server_fd, '127.0.0.1', port)
+    @machine.listen(server_fd, UM::SOMAXCONN)
+
+    client_conn_fd = @machine.socket(UM::AF_INET, UM::SOCK_STREAM, 0, 0)
+    @machine.connect(client_conn_fd, '127.0.0.1', port)
+
+    server_conn_fd = @machine.accept(server_fd)
+
+    @machine.close(server_fd)
+    [client_conn_fd, server_conn_fd]
+  end
+
+  def setup
+    @machine = UM.new
+    @c_fd, @s_fd = make_socket_pair
+    # s = @machine.io(@s_fd, :socket)
+
+    @app = ->(req) { req.respond(nil, ':status' => Syntropy::HTTP::INTERNAL_SERVER_ERROR) }
+    @env = {}
+    @connection = Syntropy::HTTP::ServerConnection.new(@machine, @s_fd, @env) { |req| @app.(req) }
+  end
+
+  def teardown
+    @machine.close(@c_fd) rescue nil
+    @machine.close(@s_fd) rescue nil
+  end
+
+  def write_http_request(msg, shutdown_wr = true)
+    @machine.send(@c_fd, msg, msg.bytesize, UM::MSG_WAITALL)
+    @machine.shutdown(@c_fd, UM::SHUT_WR) if shutdown_wr
+  end
+
+  def write_client_side(msg)
+    @machine.send(@c_fd, msg, msg.bytesize, UM::MSG_WAITALL)
+  end
+
+  def read_client_side(len = 65536)
+    buf = +''
+    res = @machine.recv(@c_fd, buf, len, 0)
+    res == 0 ? nil : buf
+  end
+
+  def test_session_kv_access
+    current = :something
+
+    @app = ->(req) {
+      req.session['foo'] = 'bar'
+      current = req.session['foo']
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n"
+    @connection.serve_request
+
+    assert_equal 'bar', current
+
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+  end
+
+  def test_session_kv_multi
+    @app = ->(req) {
+      req.session['foo'] = 'bar'
+      req.session['bar'] = 'baz'
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n"
+    @connection.serve_request
+
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar', 'bar' => 'baz' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+  end
+
+  def test_session_kv_sequence
+    counter = 0
+
+    @app = ->(req) {
+      counter += 1
+      case counter
+      when 1
+        req.session['foo'] = 'bar'
+      when 2
+        req.session['foo'] = req.session['foo'] + 'baz'
+      end
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n", false
+    @connection.serve_request
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+
+    write_http_request "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{data}\r\n\r\n"
+    @connection.serve_request
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'barbaz' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+  end
+
+  def test_session_kv_delete
+    counter = 0
+
+    @app = ->(req) {
+      counter += 1
+      case counter
+      when 1
+        req.session['foo'] = 'bar'
+      when 2
+        req.session.delete('foo')
+      end
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n", false
+    @connection.serve_request
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+
+    write_http_request "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{data}\r\n\r\n"
+    @connection.serve_request
+    response = read_client_side
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/; Max-Age=0; HttpOnly\r\n\r\n", response
+  end
+
+  def test_session_discard
+    counter = 0
+
+    @app = ->(req) {
+      counter += 1
+      case counter
+      when 1
+        req.session['foo'] = 'bar'
+      when 2
+        req.session.discard
+      end
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n", false
+    @connection.serve_request
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+
+    write_http_request "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{data}\r\n\r\n"
+    @connection.serve_request
+    response = read_client_side
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/; Max-Age=0; HttpOnly\r\n\r\n", response
+  end
+
+  def test_flash_simple
+    counter = 0
+    flash_notices = []
+
+    @app = ->(req) do
+      counter += 1
+      case counter
+      when 1
+        req.session.flash[:notice] = "Hello flash!"
+        flash_notices << req.session.flash[:notice]
+      when 2
+        flash_notices << req.session.flash[:notice]
+      when 3
+        flash_notices << req.session.flash[:notice]
+      end
+      req.respond(nil)
+    end
+
+    parse_cookie = ->(response) {
+      m = response.match(/Set-Cookie: __syntropy_session__=([^\s;]*)/)
+      m && m[1]
+    }
+
+    cookie = nil
+
+    3.times {
+      request = cookie ? "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{cookie}\r\n\r\n" : "GET / HTTP/1.1\r\n\r\n"
+      write_http_request request, false
+      @connection.serve_request
+      response = read_client_side
+      v = parse_cookie.(response)
+      if v
+        cookie = v.empty? ? nil : v
+      end
+    }
+
+    assert_equal [nil, 'Hello flash!', nil], flash_notices
+  end
+
+  def test_flash_each
+    counter = 0
+    flash_content = []
+
+    @app = ->(req) do
+      counter += 1
+      case counter
+      when 1
+        req.session.flash[:notice] = "Hello flash!"
+        a = []
+        req.session.flash.each { |k, v| a << [k, v] }
+        flash_content << a
+      when 2
+        a = []
+        req.session.flash.each { |k, v| a << [k, v] }
+        flash_content << a
+      when 3
+        a = []
+        req.session.flash.each { |k, v| a << [k, v] }
+        flash_content << a
+      end
+      req.respond(nil)
+    end
+
+    parse_cookie = ->(response) {
+      m = response.match(/Set-Cookie: __syntropy_session__=([^\s;]*)/)
+      m && m[1]
+    }
+
+    set_cookies = []
+    cookie = nil
+
+    3.times {
+      request = cookie ? "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{cookie}\r\n\r\n" : "GET / HTTP/1.1\r\n\r\n"
+      write_http_request request, false
+      @connection.serve_request
+      response = read_client_side
+      v = parse_cookie.(response)
+      if v
+        cookie = v.empty? ? nil : v
+      end
+      set_cookies << v ? cookie : nil
+    }
+
+    assert_equal [
+      [],
+      [[:notice, 'Hello flash!']],
+      []
+    ], flash_content
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -65,6 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +226,6 @@ files:
 - examples/mcp-oauth/app/oauth/register.rb
 - examples/mcp-oauth/app/oauth/token.rb
 - examples/mcp-oauth/app/signin.rb
-- examples/mcp-oauth/test/helper.rb
 - examples/mcp-oauth/test/test_app.rb
 - examples/mcp-oauth/test/test_oauth.rb
 - lib/syntropy.rb
@@ -248,6 +261,7 @@ files:
 - lib/syntropy/request/mock_adapter.rb
 - lib/syntropy/request/request_info.rb
 - lib/syntropy/request/response.rb
+- lib/syntropy/request/session.rb
 - lib/syntropy/request/validation.rb
 - lib/syntropy/routing_tree.rb
 - lib/syntropy/side_run.rb
@@ -311,6 +325,7 @@ files:
 - test/test_mock_adapter.rb
 - test/test_module_loader.rb
 - test/test_request.rb
+- test/test_request_session.rb
 - test/test_response.rb
 - test/test_routing_tree.rb
 - test/test_server.rb

data/examples/mcp-oauth/test/helper.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# require 'bundler/setup'
-# require 'syntropy'
-# require 'syntropy/test'
-# require 'minitest/autorun'
-
-# STDOUT.sync = true
-# STDERR.sync = true