Data Flow fixing from web ui

Author: voltsparx

lib/asrfacet_rb/web/server.rb

@@ -12,6 +12,7 @@
 # and conditions defined in the LICENSE file.
 
 require "json"
+require "uri"
 require "webrick"
 
 module ASRFacet
@@ -122,7 +123,7 @@ def handle_sessions(req, res)
       end
 
       def handle_session_lookup(req, res)
-        session = @session_store.fetch(req.query["id"].to_s)
+        session = @session_store.fetch(request_param(req, "id").to_s)
         session ? respond_json(res, { session: session }) : respond_json(res, { error: "not_found" }, status: 404)
       rescue StandardError
         respond_json(res, { error: "lookup_failed" }, status: 500)
@@ -131,7 +132,7 @@ def handle_session_lookup(req, res)
       def handle_run(req, res)
         return respond_json(res, { error: "method_not_allowed" }, status: 405) unless req.request_method == "POST"
 
-        session_id = req.query["id"].to_s
+        session_id = request_param(req, "id").to_s
         return respond_json(res, { error: "not_found" }, status: 404) if @session_store.fetch(session_id).nil?
 
         if @session_runner.start(session_id)
@@ -276,6 +277,24 @@ def parse_json(req)
         {}
       end
 
+      def request_param(req, key)
+        key_name = key.to_s
+        from_query = req.query[key_name].to_s
+        return from_query unless from_query.empty?
+
+        query_string = req.query_string.to_s
+        if query_string.empty?
+          request_uri = req.request_uri
+          query_string = request_uri.query.to_s if request_uri.respond_to?(:query)
+          query_string = request_uri.to_s.split("?", 2).last.to_s if query_string.empty? && request_uri.to_s.include?("?")
+        end
+        return nil if query_string.empty?
+
+        URI.decode_www_form(query_string).to_h[key_name]
+      rescue StandardError
+        nil
+      end
+
       def respond_json(res, payload, status: 200)
         res.status = status
         res["Content-Type"] = "application/json; charset=utf-8"

lib/asrfacet_rb/web/session_store.rb

@@ -244,7 +244,7 @@ def path_for(id)
       def load_file(path)
         return nil unless File.file?(path)
 
-        symbolize(JSON.parse(File.read(path)))
+        hydrate_session(symbolize(JSON.parse(File.read(path))))
       rescue StandardError
         nil
       end
@@ -270,12 +270,14 @@ def deep_merge(base, extra)
       end
 
       def normalize(value)
-        if value.respond_to?(:to_h) && !value.is_a?(Hash)
-          normalize(value.to_h)
-        elsif value.is_a?(Hash)
+        if value.is_a?(Hash)
           value.each_with_object({}) { |(key, nested), memo| memo[key.to_sym] = normalize(nested) }
         elsif value.is_a?(Array)
           value.map { |entry| normalize(entry) }
+        elsif value.nil?
+          nil
+        elsif value.respond_to?(:to_h) && !value.is_a?(Hash)
+          normalize(value.to_h)
         else
           value
         end
@@ -347,6 +349,16 @@ def normalize_failure(message)
           recommendation: "Review the session activity log and rerun with a healthier framework or target configuration."
         }
       end
+
+      def hydrate_session(session)
+        item = symbolize(session)
+        item[:events] = [] if item[:events].is_a?(Hash) && item[:events].empty?
+        item[:error] = nil if item[:error].is_a?(Hash) && item[:error].empty?
+        item[:last_heartbeat_at] = nil if item[:last_heartbeat_at].is_a?(Hash) && item[:last_heartbeat_at].empty?
+        item
+      rescue StandardError
+        session
+      end
     end
   end
 end

spec/web/server_spec.rb

@@ -12,6 +12,7 @@
 # and conditions defined in the LICENSE file.
 
 require "spec_helper"
+require "json"
 
 RSpec.describe ASRFacet::Web::Server do
   it "renders the branded dashboard shell with external assets and workspace views" do
@@ -26,4 +27,42 @@
     expect(html).to include("About ASRFacet-Rb")
     expect(html).to include("Documentation")
   end
+
+  it "starts a saved session when the run id is passed in the POST query string" do
+    session_store = instance_double(ASRFacet::Web::SessionStore)
+    session_runner = instance_double(ASRFacet::Web::SessionRunner)
+    response_class = Class.new do
+      attr_accessor :status, :body
+
+      def initialize
+        @headers = {}
+      end
+
+      def []=(key, value)
+        @headers[key] = value
+      end
+
+      def [](key)
+        @headers[key]
+      end
+    end
+    request = Struct.new(:request_method, :query, :query_string, :request_uri, :body).new(
+      "POST",
+      {},
+      "id=session-123",
+      URI("http://127.0.0.1/api/run?id=session-123"),
+      ""
+    )
+    response = response_class.new
+
+    allow(session_store).to receive(:fetch).with("session-123").and_return({ id: "session-123" })
+    allow(session_store).to receive(:append_event)
+    allow(session_runner).to receive(:start).with("session-123").and_return(true)
+
+    described_class.new(session_store: session_store, session_runner: session_runner).send(:handle_run, request, response)
+
+    expect(response.status).to eq(200)
+    expect(JSON.parse(response.body)).to include("ok" => true, "session_id" => "session-123")
+    expect(session_store).to have_received(:append_event).with("session-123", hash_including(type: "system"))
+  end
 end

spec/web/session_store_spec.rb

@@ -79,4 +79,16 @@
       )
     end
   end
+
+  it "preserves array and nil session fields when persisting to disk" do
+    Dir.mktmpdir do |dir|
+      store = described_class.new(root: dir)
+      session = store.create_or_update(name: "Shape check", config: { target: "example.com" })
+      recovered = store.fetch(session[:id])
+
+      expect(recovered[:events]).to eq([])
+      expect(recovered[:error]).to be_nil
+      expect(recovered[:last_heartbeat_at]).to be_nil
+    end
+  end
 end