@@ -67,7 +67,7 @@ def initialize_capabilities(server)
6767 assert_equal ( { skills : [ ] } , server . handle ( request ( "skills/list" ) ) [ :result ] )
6868 response = server . handle ( request ( "skills/get" , { uri : "skill://x/SKILL.md" } ) )
6969 assert_equal ( -32602 , response [ :error ] [ :code ] )
70- assert_equal " Skill not found: skill://x/SKILL.md", response [ :error ] [ :message ]
70+ assert_equal ' Skill not found: " skill://x/SKILL.md"' , response [ :error ] [ :message ]
7171 assert_equal ( { uri : "skill://x/SKILL.md" } , response [ :error ] [ :data ] )
7272 end
7373
@@ -139,12 +139,65 @@ def initialize_capabilities(server)
139139 test "skills/get refuses a URI that does not name a SKILL.md before any lookup" do
140140 server = Server . new ( name : "catalog" , skills : [ pdf_skill ] )
141141
142- [ "skill://pdf-processing/references/FORMS.md" , "skill://pdf-processing" , "http://x/SKILL.md" , nil , 42 ] . each do |uri |
142+ [ "skill://pdf-processing/references/FORMS.md" , "skill://pdf-processing" , "http://x/SKILL.md" ] . each do |uri |
143143 response = server . handle ( request ( "skills/get" , { uri : uri } ) )
144- assert_equal ( -32602 , response [ :error ] [ :code ] , uri . inspect )
144+ assert_equal ( -32602 , response [ :error ] [ :code ] , uri )
145145 assert_equal "Invalid params: uri is not a skill SKILL.md URI" , response [ :error ] [ :message ]
146146 assert_equal ( { uri : uri } , response [ :error ] [ :data ] )
147147 end
148+
149+ # A value that is not a String is not echoed, since it could hold bytes JSON cannot generate anywhere.
150+ [ nil , 42 , { "k" => "\xFF " } , [ "\xFF " ] ] . each do |uri |
151+ response = server . handle ( request ( "skills/get" , { uri : uri } ) )
152+ assert_equal ( -32602 , response [ :error ] [ :code ] , uri . inspect )
153+ assert_equal "Invalid params: uri is not a skill SKILL.md URI" , response [ :error ] [ :message ]
154+ assert_equal response [ :error ] [ :message ] , response [ :error ] [ :data ] , uri . inspect
155+ end
156+ json = server . handle_json ( %({"jsonrpc":"2.0","id":1,"method":"skills/get","params":{"uri":{"k":"\xFF "}}}) )
157+ assert_equal ( -32602 , JSON . parse ( json , symbolize_names : true ) [ :error ] [ :code ] )
158+ end
159+
160+ test "skills/get refuses a URI that is not valid UTF-8 as invalid params, with an answer JSON can generate" do
161+ server = Server . new ( name : "catalog" , skills : [ pdf_skill ] )
162+ uri = "skill://pdf-processing\xFF /SKILL.md"
163+
164+ response = server . handle ( request ( "skills/get" , { uri : uri } ) )
165+ assert_equal ( -32602 , response [ :error ] [ :code ] )
166+ assert_equal "Invalid params: uri is not a skill SKILL.md URI" , response [ :error ] [ :message ]
167+ assert_equal "skill://pdf-processing\uFFFD /SKILL.md" , response [ :error ] [ :data ] [ :uri ]
168+
169+ # The parser passes the bytes through inside a string, and the refusal has to be generated around them.
170+ json = server . handle_json ( %({"jsonrpc":"2.0","id":1,"method":"skills/get","params":{"uri":"#{ uri } "}}) )
171+ response = JSON . parse ( json , symbolize_names : true )
172+ assert_equal ( -32602 , response [ :error ] [ :code ] )
173+ assert_equal "skill://pdf-processing\uFFFD /SKILL.md" , response [ :error ] [ :data ] [ :uri ]
174+ end
175+
176+ test "the Skill not found message quotes the URI, so the exception reporter gets one printable line" do
177+ reported = [ ]
178+ configuration = Configuration . new ( exception_reporter : -> ( exception , _context ) { reported << exception } )
179+ server = Server . new ( name : "catalog" , skills : [ pdf_skill ] , configuration : configuration )
180+ uri = "skill://x\r \n forged: line\e [0m/SKILL.md"
181+
182+ response = server . handle ( request ( "skills/get" , { uri : uri } ) )
183+ assert_equal ( -32602 , response [ :error ] [ :code ] )
184+ assert_equal 'Skill not found: "skill://x\r\nforged: line\e[0m/SKILL.md"' , response [ :error ] [ :message ]
185+ assert_equal ( { uri : uri } , response [ :error ] [ :data ] )
186+ assert_equal [ response [ :error ] [ :message ] ] , reported . map ( &:message )
187+ end
188+
189+ test "a URI given to handle as a binary String is read as UTF-8 for the error data" do
190+ server = Server . new ( name : "catalog" , skills : [ pdf_skill ] )
191+
192+ # Validly encoded, so a manifest URI that names no skill. json 3.1 refuses to generate a binary String holding
193+ # high bytes (json 3.0 generates this one with a deprecation warning, since its bytes are valid UTF-8), so the
194+ # error data carries the same bytes read as UTF-8.
195+ response = server . handle ( request ( "skills/get" , { uri : "skill://x\xC3 \xA9 /SKILL.md" . b } ) )
196+ assert_equal ( -32602 , response [ :error ] [ :code ] )
197+ assert_equal 'Skill not found: "skill://x\xC3\xA9/SKILL.md"' , response [ :error ] [ :message ]
198+ assert_equal "skill://x\xC3 \xA9 /SKILL.md" , response [ :error ] [ :data ] [ :uri ]
199+ assert_equal Encoding ::UTF_8 , response [ :error ] [ :data ] [ :uri ] . encoding
200+ assert_equal "skill://x\xC3 \xA9 /SKILL.md" , JSON . parse ( JSON . generate ( response ) , symbolize_names : true ) [ :error ] [ :data ] [ :uri ]
148201 end
149202
150203 test "refuses a registry with duplicate URIs and accepts an enclosing skill that lists a nested skill's files" do
@@ -187,7 +240,7 @@ def initialize_capabilities(server)
187240 assert_equal pdf_skill . to_h , server . handle ( request ( "skills/get" , { uri : "skill://pdf-processing/SKILL.md" } ) ) . dig ( :result , :skill )
188241 response = server . handle ( request ( "skills/get" , { uri : "skill://git/SKILL.md" } ) )
189242 assert_equal ( -32602 , response [ :error ] [ :code ] )
190- assert_equal " Skill not found: skill://git/SKILL.md", response [ :error ] [ :message ]
243+ assert_equal ' Skill not found: " skill://git/SKILL.md"' , response [ :error ] [ :message ]
191244 assert_equal [ ] , server . skills
192245 end
193246
@@ -276,6 +329,7 @@ def initialize_capabilities(server)
276329 assert_equal ( -32603 , server . handle ( request ( "skills/get" , { uri : "skill://pdf-processing/SKILL.md" } ) ) [ :error ] [ :code ] )
277330 results [ :get ] = git_skill
278331 assert_equal ( -32603 , server . handle ( request ( "skills/get" , { uri : "skill://pdf-processing/SKILL.md" } ) ) [ :error ] [ :code ] )
332+ assert_equal 'skills/get returned "skill://git/SKILL.md" for "skill://pdf-processing/SKILL.md"' , reported . last . message
279333 assert_equal 5 , reported . size
280334 assert reported . all? { |exception | exception . is_a? ( StandardError ) && !exception . is_a? ( Server ::RequestHandlerError ) }
281335
0 commit comments