rack 1.6.13 → 2.0.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of rack might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/COPYING +1 -1
- data/HISTORY.md +138 -8
- data/README.rdoc +17 -25
- data/Rakefile +6 -14
- data/SPEC +8 -9
- data/contrib/rack_logo.svg +164 -111
- data/example/protectedlobster.rb +1 -1
- data/example/protectedlobster.ru +1 -1
- data/lib/rack/auth/abstract/request.rb +5 -1
- data/lib/rack/auth/digest/params.rb +2 -3
- data/lib/rack/auth/digest/request.rb +1 -1
- data/lib/rack/body_proxy.rb +14 -9
- data/lib/rack/builder.rb +3 -3
- data/lib/rack/chunked.rb +5 -5
- data/lib/rack/{commonlogger.rb → common_logger.rb} +3 -3
- data/lib/rack/{conditionalget.rb → conditional_get.rb} +0 -0
- data/lib/rack/content_length.rb +2 -2
- data/lib/rack/deflater.rb +4 -4
- data/lib/rack/directory.rb +66 -54
- data/lib/rack/etag.rb +4 -3
- data/lib/rack/events.rb +154 -0
- data/lib/rack/file.rb +63 -39
- data/lib/rack/handler/cgi.rb +15 -16
- data/lib/rack/handler/fastcgi.rb +13 -14
- data/lib/rack/handler/lsws.rb +11 -11
- data/lib/rack/handler/scgi.rb +15 -15
- data/lib/rack/handler/thin.rb +3 -0
- data/lib/rack/handler/webrick.rb +22 -24
- data/lib/rack/handler.rb +3 -25
- data/lib/rack/head.rb +15 -17
- data/lib/rack/lint.rb +38 -38
- data/lib/rack/lobster.rb +1 -1
- data/lib/rack/lock.rb +6 -10
- data/lib/rack/logger.rb +2 -2
- data/lib/rack/media_type.rb +38 -0
- data/lib/rack/{methodoverride.rb → method_override.rb} +4 -11
- data/lib/rack/mime.rb +18 -5
- data/lib/rack/mock.rb +35 -53
- data/lib/rack/multipart/generator.rb +5 -5
- data/lib/rack/multipart/parser.rb +272 -158
- data/lib/rack/multipart/uploaded_file.rb +1 -2
- data/lib/rack/multipart.rb +35 -6
- data/lib/rack/{nulllogger.rb → null_logger.rb} +1 -1
- data/lib/rack/query_parser.rb +192 -0
- data/lib/rack/recursive.rb +8 -8
- data/lib/rack/request.rb +383 -307
- data/lib/rack/response.rb +129 -56
- data/lib/rack/rewindable_input.rb +1 -12
- data/lib/rack/runtime.rb +10 -18
- data/lib/rack/sendfile.rb +5 -7
- data/lib/rack/server.rb +31 -25
- data/lib/rack/session/abstract/id.rb +95 -135
- data/lib/rack/session/cookie.rb +26 -28
- data/lib/rack/session/memcache.rb +8 -14
- data/lib/rack/session/pool.rb +14 -21
- data/lib/rack/show_exceptions.rb +386 -0
- data/lib/rack/{showstatus.rb → show_status.rb} +3 -3
- data/lib/rack/static.rb +30 -5
- data/lib/rack/tempfile_reaper.rb +2 -2
- data/lib/rack/urlmap.rb +15 -14
- data/lib/rack/utils.rb +135 -210
- data/lib/rack.rb +70 -21
- data/rack.gemspec +7 -5
- data/test/builder/an_underscore_app.rb +5 -0
- data/test/builder/options.ru +1 -1
- data/test/cgi/test.fcgi +1 -0
- data/test/cgi/test.gz +0 -0
- data/test/helper.rb +34 -0
- data/test/multipart/filename_with_encoded_words +7 -0
- data/test/multipart/{filename_with_null_byte → filename_with_single_quote} +1 -1
- data/test/multipart/quoted +15 -0
- data/test/multipart/rack-logo.png +0 -0
- data/test/multipart/unity3d_wwwform +11 -0
- data/test/registering_handler/rack/handler/registering_myself.rb +1 -1
- data/test/spec_auth_basic.rb +27 -19
- data/test/spec_auth_digest.rb +47 -46
- data/test/spec_body_proxy.rb +27 -27
- data/test/spec_builder.rb +51 -41
- data/test/spec_cascade.rb +24 -22
- data/test/spec_cgi.rb +49 -67
- data/test/spec_chunked.rb +36 -34
- data/test/{spec_commonlogger.rb → spec_common_logger.rb} +23 -21
- data/test/{spec_conditionalget.rb → spec_conditional_get.rb} +29 -28
- data/test/spec_config.rb +3 -2
- data/test/spec_content_length.rb +18 -17
- data/test/spec_content_type.rb +13 -12
- data/test/spec_deflater.rb +66 -40
- data/test/spec_directory.rb +87 -27
- data/test/spec_etag.rb +32 -31
- data/test/spec_events.rb +133 -0
- data/test/spec_fastcgi.rb +50 -72
- data/test/spec_file.rb +107 -77
- data/test/spec_handler.rb +19 -34
- data/test/spec_head.rb +15 -14
- data/test/spec_lint.rb +162 -197
- data/test/spec_lobster.rb +24 -23
- data/test/spec_lock.rb +69 -39
- data/test/spec_logger.rb +4 -3
- data/test/spec_media_type.rb +42 -0
- data/test/spec_method_override.rb +83 -0
- data/test/spec_mime.rb +19 -19
- data/test/spec_mock.rb +196 -151
- data/test/spec_multipart.rb +317 -201
- data/test/{spec_nulllogger.rb → spec_null_logger.rb} +5 -4
- data/test/spec_recursive.rb +17 -14
- data/test/spec_request.rb +768 -607
- data/test/spec_response.rb +214 -111
- data/test/spec_rewindable_input.rb +50 -40
- data/test/spec_runtime.rb +11 -10
- data/test/spec_sendfile.rb +30 -35
- data/test/spec_server.rb +78 -52
- data/test/spec_session_abstract_id.rb +11 -33
- data/test/spec_session_abstract_session_hash.rb +28 -0
- data/test/spec_session_cookie.rb +97 -65
- data/test/spec_session_memcache.rb +63 -101
- data/test/spec_session_pool.rb +48 -84
- data/test/spec_show_exceptions.rb +80 -0
- data/test/{spec_showstatus.rb → spec_show_status.rb} +36 -35
- data/test/spec_static.rb +71 -32
- data/test/spec_tempfile_reaper.rb +11 -10
- data/test/spec_thin.rb +55 -50
- data/test/spec_urlmap.rb +79 -78
- data/test/spec_utils.rb +441 -346
- data/test/spec_version.rb +2 -8
- data/test/spec_webrick.rb +91 -67
- data/test/static/foo.html +1 -0
- data/test/testrequest.rb +1 -1
- data/test/unregistered_handler/rack/handler/unregistered.rb +1 -1
- data/test/unregistered_handler/rack/handler/unregistered_long_one.rb +1 -1
- metadata +103 -69
- data/KNOWN-ISSUES +0 -44
- data/lib/rack/backports/uri/common_18.rb +0 -56
- data/lib/rack/backports/uri/common_192.rb +0 -52
- data/lib/rack/backports/uri/common_193.rb +0 -29
- data/lib/rack/handler/evented_mongrel.rb +0 -8
- data/lib/rack/handler/mongrel.rb +0 -106
- data/lib/rack/handler/swiftiplied_mongrel.rb +0 -8
- data/lib/rack/showexceptions.rb +0 -387
- data/lib/rack/utils/okjson.rb +0 -600
- data/test/spec_methodoverride.rb +0 -111
- data/test/spec_mongrel.rb +0 -182
- data/test/spec_session_persisted_secure_secure_session_hash.rb +0 -73
- data/test/spec_showexceptions.rb +0 -98
data/lib/rack/utils/okjson.rb
DELETED
@@ -1,600 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
#
|
3
|
-
# Copyright 2011, 2012 Keith Rarick
|
4
|
-
#
|
5
|
-
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
6
|
-
# of this software and associated documentation files (the "Software"), to deal
|
7
|
-
# in the Software without restriction, including without limitation the rights
|
8
|
-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
9
|
-
# copies of the Software, and to permit persons to whom the Software is
|
10
|
-
# furnished to do so, subject to the following conditions:
|
11
|
-
#
|
12
|
-
# The above copyright notice and this permission notice shall be included in
|
13
|
-
# all copies or substantial portions of the Software.
|
14
|
-
#
|
15
|
-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
16
|
-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
17
|
-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
18
|
-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
19
|
-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
20
|
-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
21
|
-
# THE SOFTWARE.
|
22
|
-
|
23
|
-
# See https://github.com/kr/okjson for updates.
|
24
|
-
|
25
|
-
require 'stringio'
|
26
|
-
|
27
|
-
# Some parts adapted from
|
28
|
-
# https://golang.org/src/encoding/json/decode.go and
|
29
|
-
# https://golang.org/src/unicode/utf8/utf8.go
|
30
|
-
module Rack::Utils::OkJson
|
31
|
-
Upstream = '43'
|
32
|
-
extend self
|
33
|
-
|
34
|
-
|
35
|
-
# Decodes a json document in string s and
|
36
|
-
# returns the corresponding ruby value.
|
37
|
-
# String s must be valid UTF-8. If you have
|
38
|
-
# a string in some other encoding, convert
|
39
|
-
# it first.
|
40
|
-
#
|
41
|
-
# String values in the resulting structure
|
42
|
-
# will be UTF-8.
|
43
|
-
def decode(s)
|
44
|
-
ts = lex(s)
|
45
|
-
v, ts = textparse(ts)
|
46
|
-
if ts.length > 0
|
47
|
-
raise Error, 'trailing garbage'
|
48
|
-
end
|
49
|
-
v
|
50
|
-
end
|
51
|
-
|
52
|
-
|
53
|
-
# Encodes x into a json text. It may contain only
|
54
|
-
# Array, Hash, String, Numeric, true, false, nil.
|
55
|
-
# (Note, this list excludes Symbol.)
|
56
|
-
# X itself must be an Array or a Hash.
|
57
|
-
# No other value can be encoded, and an error will
|
58
|
-
# be raised if x contains any other value, such as
|
59
|
-
# Nan, Infinity, Symbol, and Proc, or if a Hash key
|
60
|
-
# is not a String.
|
61
|
-
# Strings contained in x must be valid UTF-8.
|
62
|
-
def encode(x)
|
63
|
-
case x
|
64
|
-
when Hash then objenc(x)
|
65
|
-
when Array then arrenc(x)
|
66
|
-
else
|
67
|
-
raise Error, 'root value must be an Array or a Hash'
|
68
|
-
end
|
69
|
-
end
|
70
|
-
|
71
|
-
|
72
|
-
def valenc(x)
|
73
|
-
case x
|
74
|
-
when Hash then objenc(x)
|
75
|
-
when Array then arrenc(x)
|
76
|
-
when String then strenc(x)
|
77
|
-
when Numeric then numenc(x)
|
78
|
-
when true then "true"
|
79
|
-
when false then "false"
|
80
|
-
when nil then "null"
|
81
|
-
else
|
82
|
-
raise Error, "cannot encode #{x.class}: #{x.inspect}"
|
83
|
-
end
|
84
|
-
end
|
85
|
-
|
86
|
-
|
87
|
-
private
|
88
|
-
|
89
|
-
|
90
|
-
# Parses a "json text" in the sense of RFC 4627.
|
91
|
-
# Returns the parsed value and any trailing tokens.
|
92
|
-
# Note: this is almost the same as valparse,
|
93
|
-
# except that it does not accept atomic values.
|
94
|
-
def textparse(ts)
|
95
|
-
if ts.length <= 0
|
96
|
-
raise Error, 'empty'
|
97
|
-
end
|
98
|
-
|
99
|
-
typ, _, val = ts[0]
|
100
|
-
case typ
|
101
|
-
when '{' then objparse(ts)
|
102
|
-
when '[' then arrparse(ts)
|
103
|
-
else
|
104
|
-
raise Error, "unexpected #{val.inspect}"
|
105
|
-
end
|
106
|
-
end
|
107
|
-
|
108
|
-
|
109
|
-
# Parses a "value" in the sense of RFC 4627.
|
110
|
-
# Returns the parsed value and any trailing tokens.
|
111
|
-
def valparse(ts)
|
112
|
-
if ts.length <= 0
|
113
|
-
raise Error, 'empty'
|
114
|
-
end
|
115
|
-
|
116
|
-
typ, _, val = ts[0]
|
117
|
-
case typ
|
118
|
-
when '{' then objparse(ts)
|
119
|
-
when '[' then arrparse(ts)
|
120
|
-
when :val,:str then [val, ts[1..-1]]
|
121
|
-
else
|
122
|
-
raise Error, "unexpected #{val.inspect}"
|
123
|
-
end
|
124
|
-
end
|
125
|
-
|
126
|
-
|
127
|
-
# Parses an "object" in the sense of RFC 4627.
|
128
|
-
# Returns the parsed value and any trailing tokens.
|
129
|
-
def objparse(ts)
|
130
|
-
ts = eat('{', ts)
|
131
|
-
obj = {}
|
132
|
-
|
133
|
-
if ts[0][0] == '}'
|
134
|
-
return obj, ts[1..-1]
|
135
|
-
end
|
136
|
-
|
137
|
-
k, v, ts = pairparse(ts)
|
138
|
-
obj[k] = v
|
139
|
-
|
140
|
-
if ts[0][0] == '}'
|
141
|
-
return obj, ts[1..-1]
|
142
|
-
end
|
143
|
-
|
144
|
-
loop do
|
145
|
-
ts = eat(',', ts)
|
146
|
-
|
147
|
-
k, v, ts = pairparse(ts)
|
148
|
-
obj[k] = v
|
149
|
-
|
150
|
-
if ts[0][0] == '}'
|
151
|
-
return obj, ts[1..-1]
|
152
|
-
end
|
153
|
-
end
|
154
|
-
end
|
155
|
-
|
156
|
-
|
157
|
-
# Parses a "member" in the sense of RFC 4627.
|
158
|
-
# Returns the parsed values and any trailing tokens.
|
159
|
-
def pairparse(ts)
|
160
|
-
(typ, _, k), ts = ts[0], ts[1..-1]
|
161
|
-
if typ != :str
|
162
|
-
raise Error, "unexpected #{k.inspect}"
|
163
|
-
end
|
164
|
-
ts = eat(':', ts)
|
165
|
-
v, ts = valparse(ts)
|
166
|
-
[k, v, ts]
|
167
|
-
end
|
168
|
-
|
169
|
-
|
170
|
-
# Parses an "array" in the sense of RFC 4627.
|
171
|
-
# Returns the parsed value and any trailing tokens.
|
172
|
-
def arrparse(ts)
|
173
|
-
ts = eat('[', ts)
|
174
|
-
arr = []
|
175
|
-
|
176
|
-
if ts[0][0] == ']'
|
177
|
-
return arr, ts[1..-1]
|
178
|
-
end
|
179
|
-
|
180
|
-
v, ts = valparse(ts)
|
181
|
-
arr << v
|
182
|
-
|
183
|
-
if ts[0][0] == ']'
|
184
|
-
return arr, ts[1..-1]
|
185
|
-
end
|
186
|
-
|
187
|
-
loop do
|
188
|
-
ts = eat(',', ts)
|
189
|
-
|
190
|
-
v, ts = valparse(ts)
|
191
|
-
arr << v
|
192
|
-
|
193
|
-
if ts[0][0] == ']'
|
194
|
-
return arr, ts[1..-1]
|
195
|
-
end
|
196
|
-
end
|
197
|
-
end
|
198
|
-
|
199
|
-
|
200
|
-
def eat(typ, ts)
|
201
|
-
if ts[0][0] != typ
|
202
|
-
raise Error, "expected #{typ} (got #{ts[0].inspect})"
|
203
|
-
end
|
204
|
-
ts[1..-1]
|
205
|
-
end
|
206
|
-
|
207
|
-
|
208
|
-
# Scans s and returns a list of json tokens,
|
209
|
-
# excluding white space (as defined in RFC 4627).
|
210
|
-
def lex(s)
|
211
|
-
ts = []
|
212
|
-
while s.length > 0
|
213
|
-
typ, lexeme, val = tok(s)
|
214
|
-
if typ == nil
|
215
|
-
raise Error, "invalid character at #{s[0,10].inspect}"
|
216
|
-
end
|
217
|
-
if typ != :space
|
218
|
-
ts << [typ, lexeme, val]
|
219
|
-
end
|
220
|
-
s = s[lexeme.length..-1]
|
221
|
-
end
|
222
|
-
ts
|
223
|
-
end
|
224
|
-
|
225
|
-
|
226
|
-
# Scans the first token in s and
|
227
|
-
# returns a 3-element list, or nil
|
228
|
-
# if s does not begin with a valid token.
|
229
|
-
#
|
230
|
-
# The first list element is one of
|
231
|
-
# '{', '}', ':', ',', '[', ']',
|
232
|
-
# :val, :str, and :space.
|
233
|
-
#
|
234
|
-
# The second element is the lexeme.
|
235
|
-
#
|
236
|
-
# The third element is the value of the
|
237
|
-
# token for :val and :str, otherwise
|
238
|
-
# it is the lexeme.
|
239
|
-
def tok(s)
|
240
|
-
case s[0]
|
241
|
-
when ?{ then ['{', s[0,1], s[0,1]]
|
242
|
-
when ?} then ['}', s[0,1], s[0,1]]
|
243
|
-
when ?: then [':', s[0,1], s[0,1]]
|
244
|
-
when ?, then [',', s[0,1], s[0,1]]
|
245
|
-
when ?[ then ['[', s[0,1], s[0,1]]
|
246
|
-
when ?] then [']', s[0,1], s[0,1]]
|
247
|
-
when ?n then nulltok(s)
|
248
|
-
when ?t then truetok(s)
|
249
|
-
when ?f then falsetok(s)
|
250
|
-
when ?" then strtok(s)
|
251
|
-
when Spc, ?\t, ?\n, ?\r then [:space, s[0,1], s[0,1]]
|
252
|
-
else
|
253
|
-
numtok(s)
|
254
|
-
end
|
255
|
-
end
|
256
|
-
|
257
|
-
|
258
|
-
def nulltok(s); s[0,4] == 'null' ? [:val, 'null', nil] : [] end
|
259
|
-
def truetok(s); s[0,4] == 'true' ? [:val, 'true', true] : [] end
|
260
|
-
def falsetok(s); s[0,5] == 'false' ? [:val, 'false', false] : [] end
|
261
|
-
|
262
|
-
|
263
|
-
def numtok(s)
|
264
|
-
m = /-?([1-9][0-9]+|[0-9])([.][0-9]+)?([eE][+-]?[0-9]+)?/.match(s)
|
265
|
-
if m && m.begin(0) == 0
|
266
|
-
if !m[2] && !m[3]
|
267
|
-
[:val, m[0], Integer(m[0])]
|
268
|
-
elsif m[2]
|
269
|
-
[:val, m[0], Float(m[0])]
|
270
|
-
else
|
271
|
-
[:val, m[0], Integer(m[1])*(10**m[3][1..-1].to_i(10))]
|
272
|
-
end
|
273
|
-
else
|
274
|
-
[]
|
275
|
-
end
|
276
|
-
end
|
277
|
-
|
278
|
-
|
279
|
-
def strtok(s)
|
280
|
-
m = /"([^"\\]|\\["\/\\bfnrt]|\\u[0-9a-fA-F]{4})*"/.match(s)
|
281
|
-
if ! m
|
282
|
-
raise Error, "invalid string literal at #{abbrev(s)}"
|
283
|
-
end
|
284
|
-
[:str, m[0], unquote(m[0])]
|
285
|
-
end
|
286
|
-
|
287
|
-
|
288
|
-
def abbrev(s)
|
289
|
-
t = s[0,10]
|
290
|
-
p = t['`']
|
291
|
-
t = t[0,p] if p
|
292
|
-
t = t + '...' if t.length < s.length
|
293
|
-
'`' + t + '`'
|
294
|
-
end
|
295
|
-
|
296
|
-
|
297
|
-
# Converts a quoted json string literal q into a UTF-8-encoded string.
|
298
|
-
# The rules are different than for Ruby, so we cannot use eval.
|
299
|
-
# Unquote will raise an error if q contains control characters.
|
300
|
-
def unquote(q)
|
301
|
-
q = q[1...-1]
|
302
|
-
a = q.dup # allocate a big enough string
|
303
|
-
# In ruby >= 1.9, a[w] is a codepoint, not a byte.
|
304
|
-
if rubydoesenc?
|
305
|
-
a.force_encoding('UTF-8')
|
306
|
-
end
|
307
|
-
r, w = 0, 0
|
308
|
-
while r < q.length
|
309
|
-
c = q[r]
|
310
|
-
if c == ?\\
|
311
|
-
r += 1
|
312
|
-
if r >= q.length
|
313
|
-
raise Error, "string literal ends with a \"\\\": \"#{q}\""
|
314
|
-
end
|
315
|
-
|
316
|
-
case q[r]
|
317
|
-
when ?",?\\,?/,?'
|
318
|
-
a[w] = q[r]
|
319
|
-
r += 1
|
320
|
-
w += 1
|
321
|
-
when ?b,?f,?n,?r,?t
|
322
|
-
a[w] = Unesc[q[r]]
|
323
|
-
r += 1
|
324
|
-
w += 1
|
325
|
-
when ?u
|
326
|
-
r += 1
|
327
|
-
uchar = begin
|
328
|
-
hexdec4(q[r,4])
|
329
|
-
rescue RuntimeError => e
|
330
|
-
raise Error, "invalid escape sequence \\u#{q[r,4]}: #{e}"
|
331
|
-
end
|
332
|
-
r += 4
|
333
|
-
if surrogate? uchar
|
334
|
-
if q.length >= r+6
|
335
|
-
uchar1 = hexdec4(q[r+2,4])
|
336
|
-
uchar = subst(uchar, uchar1)
|
337
|
-
if uchar != Ucharerr
|
338
|
-
# A valid pair; consume.
|
339
|
-
r += 6
|
340
|
-
end
|
341
|
-
end
|
342
|
-
end
|
343
|
-
if rubydoesenc?
|
344
|
-
a[w] = '' << uchar
|
345
|
-
w += 1
|
346
|
-
else
|
347
|
-
w += ucharenc(a, w, uchar)
|
348
|
-
end
|
349
|
-
else
|
350
|
-
raise Error, "invalid escape char #{q[r]} in \"#{q}\""
|
351
|
-
end
|
352
|
-
elsif c == ?" || c < Spc
|
353
|
-
raise Error, "invalid character in string literal \"#{q}\""
|
354
|
-
else
|
355
|
-
# Copy anything else byte-for-byte.
|
356
|
-
# Valid UTF-8 will remain valid UTF-8.
|
357
|
-
# Invalid UTF-8 will remain invalid UTF-8.
|
358
|
-
# In ruby >= 1.9, c is a codepoint, not a byte,
|
359
|
-
# in which case this is still what we want.
|
360
|
-
a[w] = c
|
361
|
-
r += 1
|
362
|
-
w += 1
|
363
|
-
end
|
364
|
-
end
|
365
|
-
a[0,w]
|
366
|
-
end
|
367
|
-
|
368
|
-
|
369
|
-
# Encodes unicode character u as UTF-8
|
370
|
-
# bytes in string a at position i.
|
371
|
-
# Returns the number of bytes written.
|
372
|
-
def ucharenc(a, i, u)
|
373
|
-
if u <= Uchar1max
|
374
|
-
a[i] = (u & 0xff).chr
|
375
|
-
1
|
376
|
-
elsif u <= Uchar2max
|
377
|
-
a[i+0] = (Utag2 | ((u>>6)&0xff)).chr
|
378
|
-
a[i+1] = (Utagx | (u&Umaskx)).chr
|
379
|
-
2
|
380
|
-
elsif u <= Uchar3max
|
381
|
-
a[i+0] = (Utag3 | ((u>>12)&0xff)).chr
|
382
|
-
a[i+1] = (Utagx | ((u>>6)&Umaskx)).chr
|
383
|
-
a[i+2] = (Utagx | (u&Umaskx)).chr
|
384
|
-
3
|
385
|
-
else
|
386
|
-
a[i+0] = (Utag4 | ((u>>18)&0xff)).chr
|
387
|
-
a[i+1] = (Utagx | ((u>>12)&Umaskx)).chr
|
388
|
-
a[i+2] = (Utagx | ((u>>6)&Umaskx)).chr
|
389
|
-
a[i+3] = (Utagx | (u&Umaskx)).chr
|
390
|
-
4
|
391
|
-
end
|
392
|
-
end
|
393
|
-
|
394
|
-
|
395
|
-
def hexdec4(s)
|
396
|
-
if s.length != 4
|
397
|
-
raise Error, 'short'
|
398
|
-
end
|
399
|
-
(nibble(s[0])<<12) | (nibble(s[1])<<8) | (nibble(s[2])<<4) | nibble(s[3])
|
400
|
-
end
|
401
|
-
|
402
|
-
|
403
|
-
def subst(u1, u2)
|
404
|
-
if Usurr1 <= u1 && u1 < Usurr2 && Usurr2 <= u2 && u2 < Usurr3
|
405
|
-
return ((u1-Usurr1)<<10) | (u2-Usurr2) + Usurrself
|
406
|
-
end
|
407
|
-
return Ucharerr
|
408
|
-
end
|
409
|
-
|
410
|
-
|
411
|
-
def surrogate?(u)
|
412
|
-
Usurr1 <= u && u < Usurr3
|
413
|
-
end
|
414
|
-
|
415
|
-
|
416
|
-
def nibble(c)
|
417
|
-
if ?0 <= c && c <= ?9 then c.ord - ?0.ord
|
418
|
-
elsif ?a <= c && c <= ?z then c.ord - ?a.ord + 10
|
419
|
-
elsif ?A <= c && c <= ?Z then c.ord - ?A.ord + 10
|
420
|
-
else
|
421
|
-
raise Error, "invalid hex code #{c}"
|
422
|
-
end
|
423
|
-
end
|
424
|
-
|
425
|
-
|
426
|
-
def objenc(x)
|
427
|
-
'{' + x.map{|k,v| keyenc(k) + ':' + valenc(v)}.join(',') + '}'
|
428
|
-
end
|
429
|
-
|
430
|
-
|
431
|
-
def arrenc(a)
|
432
|
-
'[' + a.map{|x| valenc(x)}.join(',') + ']'
|
433
|
-
end
|
434
|
-
|
435
|
-
|
436
|
-
def keyenc(k)
|
437
|
-
case k
|
438
|
-
when String then strenc(k)
|
439
|
-
else
|
440
|
-
raise Error, "Hash key is not a string: #{k.inspect}"
|
441
|
-
end
|
442
|
-
end
|
443
|
-
|
444
|
-
|
445
|
-
def strenc(s)
|
446
|
-
t = StringIO.new
|
447
|
-
t.putc(?")
|
448
|
-
r = 0
|
449
|
-
|
450
|
-
while r < s.length
|
451
|
-
case s[r]
|
452
|
-
when ?" then t.print('\\"')
|
453
|
-
when ?\\ then t.print('\\\\')
|
454
|
-
when ?\b then t.print('\\b')
|
455
|
-
when ?\f then t.print('\\f')
|
456
|
-
when ?\n then t.print('\\n')
|
457
|
-
when ?\r then t.print('\\r')
|
458
|
-
when ?\t then t.print('\\t')
|
459
|
-
else
|
460
|
-
c = s[r]
|
461
|
-
# In ruby >= 1.9, s[r] is a codepoint, not a byte.
|
462
|
-
if rubydoesenc?
|
463
|
-
begin
|
464
|
-
# c.ord will raise an error if c is invalid UTF-8
|
465
|
-
if c.ord < Spc.ord
|
466
|
-
c = "\\u%04x" % [c.ord]
|
467
|
-
end
|
468
|
-
t.write(c)
|
469
|
-
rescue
|
470
|
-
t.write(Ustrerr)
|
471
|
-
end
|
472
|
-
elsif c < Spc
|
473
|
-
t.write("\\u%04x" % c)
|
474
|
-
elsif Spc <= c && c <= ?~
|
475
|
-
t.putc(c)
|
476
|
-
else
|
477
|
-
n = ucharcopy(t, s, r) # ensure valid UTF-8 output
|
478
|
-
r += n - 1 # r is incremented below
|
479
|
-
end
|
480
|
-
end
|
481
|
-
r += 1
|
482
|
-
end
|
483
|
-
t.putc(?")
|
484
|
-
t.string
|
485
|
-
end
|
486
|
-
|
487
|
-
|
488
|
-
def numenc(x)
|
489
|
-
if ((x.nan? || x.infinite?) rescue false)
|
490
|
-
raise Error, "Numeric cannot be represented: #{x}"
|
491
|
-
end
|
492
|
-
"#{x}"
|
493
|
-
end
|
494
|
-
|
495
|
-
|
496
|
-
# Copies the valid UTF-8 bytes of a single character
|
497
|
-
# from string s at position i to I/O object t, and
|
498
|
-
# returns the number of bytes copied.
|
499
|
-
# If no valid UTF-8 char exists at position i,
|
500
|
-
# ucharcopy writes Ustrerr and returns 1.
|
501
|
-
def ucharcopy(t, s, i)
|
502
|
-
n = s.length - i
|
503
|
-
raise Utf8Error if n < 1
|
504
|
-
|
505
|
-
c0 = s[i].ord
|
506
|
-
|
507
|
-
# 1-byte, 7-bit sequence?
|
508
|
-
if c0 < Utagx
|
509
|
-
t.putc(c0)
|
510
|
-
return 1
|
511
|
-
end
|
512
|
-
|
513
|
-
raise Utf8Error if c0 < Utag2 # unexpected continuation byte?
|
514
|
-
|
515
|
-
raise Utf8Error if n < 2 # need continuation byte
|
516
|
-
c1 = s[i+1].ord
|
517
|
-
raise Utf8Error if c1 < Utagx || Utag2 <= c1
|
518
|
-
|
519
|
-
# 2-byte, 11-bit sequence?
|
520
|
-
if c0 < Utag3
|
521
|
-
raise Utf8Error if ((c0&Umask2)<<6 | (c1&Umaskx)) <= Uchar1max
|
522
|
-
t.putc(c0)
|
523
|
-
t.putc(c1)
|
524
|
-
return 2
|
525
|
-
end
|
526
|
-
|
527
|
-
# need second continuation byte
|
528
|
-
raise Utf8Error if n < 3
|
529
|
-
|
530
|
-
c2 = s[i+2].ord
|
531
|
-
raise Utf8Error if c2 < Utagx || Utag2 <= c2
|
532
|
-
|
533
|
-
# 3-byte, 16-bit sequence?
|
534
|
-
if c0 < Utag4
|
535
|
-
u = (c0&Umask3)<<12 | (c1&Umaskx)<<6 | (c2&Umaskx)
|
536
|
-
raise Utf8Error if u <= Uchar2max
|
537
|
-
t.putc(c0)
|
538
|
-
t.putc(c1)
|
539
|
-
t.putc(c2)
|
540
|
-
return 3
|
541
|
-
end
|
542
|
-
|
543
|
-
# need third continuation byte
|
544
|
-
raise Utf8Error if n < 4
|
545
|
-
c3 = s[i+3].ord
|
546
|
-
raise Utf8Error if c3 < Utagx || Utag2 <= c3
|
547
|
-
|
548
|
-
# 4-byte, 21-bit sequence?
|
549
|
-
if c0 < Utag5
|
550
|
-
u = (c0&Umask4)<<18 | (c1&Umaskx)<<12 | (c2&Umaskx)<<6 | (c3&Umaskx)
|
551
|
-
raise Utf8Error if u <= Uchar3max
|
552
|
-
t.putc(c0)
|
553
|
-
t.putc(c1)
|
554
|
-
t.putc(c2)
|
555
|
-
t.putc(c3)
|
556
|
-
return 4
|
557
|
-
end
|
558
|
-
|
559
|
-
raise Utf8Error
|
560
|
-
rescue Utf8Error
|
561
|
-
t.write(Ustrerr)
|
562
|
-
return 1
|
563
|
-
end
|
564
|
-
|
565
|
-
|
566
|
-
def rubydoesenc?
|
567
|
-
::String.method_defined?(:force_encoding)
|
568
|
-
end
|
569
|
-
|
570
|
-
|
571
|
-
class Utf8Error < ::StandardError
|
572
|
-
end
|
573
|
-
|
574
|
-
|
575
|
-
class Error < ::StandardError
|
576
|
-
end
|
577
|
-
|
578
|
-
|
579
|
-
Utagx = 0b1000_0000
|
580
|
-
Utag2 = 0b1100_0000
|
581
|
-
Utag3 = 0b1110_0000
|
582
|
-
Utag4 = 0b1111_0000
|
583
|
-
Utag5 = 0b1111_1000
|
584
|
-
Umaskx = 0b0011_1111
|
585
|
-
Umask2 = 0b0001_1111
|
586
|
-
Umask3 = 0b0000_1111
|
587
|
-
Umask4 = 0b0000_0111
|
588
|
-
Uchar1max = (1<<7) - 1
|
589
|
-
Uchar2max = (1<<11) - 1
|
590
|
-
Uchar3max = (1<<16) - 1
|
591
|
-
Ucharerr = 0xFFFD # unicode "replacement char"
|
592
|
-
Ustrerr = "\xef\xbf\xbd" # unicode "replacement char"
|
593
|
-
Usurrself = 0x10000
|
594
|
-
Usurr1 = 0xd800
|
595
|
-
Usurr2 = 0xdc00
|
596
|
-
Usurr3 = 0xe000
|
597
|
-
|
598
|
-
Spc = ' '[0]
|
599
|
-
Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
|
600
|
-
end
|
data/test/spec_methodoverride.rb
DELETED
@@ -1,111 +0,0 @@
|
|
1
|
-
require 'stringio'
|
2
|
-
require 'rack/methodoverride'
|
3
|
-
require 'rack/mock'
|
4
|
-
|
5
|
-
describe Rack::MethodOverride do
|
6
|
-
def app
|
7
|
-
Rack::Lint.new(Rack::MethodOverride.new(lambda {|e|
|
8
|
-
[200, {"Content-Type" => "text/plain"}, []]
|
9
|
-
}))
|
10
|
-
end
|
11
|
-
|
12
|
-
should "not affect GET requests" do
|
13
|
-
env = Rack::MockRequest.env_for("/?_method=delete", :method => "GET")
|
14
|
-
app.call env
|
15
|
-
|
16
|
-
env["REQUEST_METHOD"].should.equal "GET"
|
17
|
-
end
|
18
|
-
|
19
|
-
should "modify REQUEST_METHOD for POST requests when _method parameter is set" do
|
20
|
-
env = Rack::MockRequest.env_for("/", :method => "POST", :input => "_method=put")
|
21
|
-
app.call env
|
22
|
-
|
23
|
-
env["REQUEST_METHOD"].should.equal "PUT"
|
24
|
-
end
|
25
|
-
|
26
|
-
if RUBY_VERSION >= "1.9"
|
27
|
-
should "set rack.errors for invalid UTF8 _method values" do
|
28
|
-
errors = StringIO.new
|
29
|
-
env = Rack::MockRequest.env_for("/",
|
30
|
-
:method => "POST",
|
31
|
-
:input => "_method=\xBF".force_encoding("ASCII-8BIT"),
|
32
|
-
"rack.errors" => errors)
|
33
|
-
|
34
|
-
app.call env
|
35
|
-
|
36
|
-
errors.rewind
|
37
|
-
errors.read.should.equal "Invalid string for method\n"
|
38
|
-
env["REQUEST_METHOD"].should.equal "POST"
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
should "modify REQUEST_METHOD for POST requests when X-HTTP-Method-Override is set" do
|
43
|
-
env = Rack::MockRequest.env_for("/",
|
44
|
-
:method => "POST",
|
45
|
-
"HTTP_X_HTTP_METHOD_OVERRIDE" => "PATCH"
|
46
|
-
)
|
47
|
-
app.call env
|
48
|
-
|
49
|
-
env["REQUEST_METHOD"].should.equal "PATCH"
|
50
|
-
end
|
51
|
-
|
52
|
-
should "not modify REQUEST_METHOD if the method is unknown" do
|
53
|
-
env = Rack::MockRequest.env_for("/", :method => "POST", :input => "_method=foo")
|
54
|
-
app.call env
|
55
|
-
|
56
|
-
env["REQUEST_METHOD"].should.equal "POST"
|
57
|
-
end
|
58
|
-
|
59
|
-
should "not modify REQUEST_METHOD when _method is nil" do
|
60
|
-
env = Rack::MockRequest.env_for("/", :method => "POST", :input => "foo=bar")
|
61
|
-
app.call env
|
62
|
-
|
63
|
-
env["REQUEST_METHOD"].should.equal "POST"
|
64
|
-
end
|
65
|
-
|
66
|
-
should "store the original REQUEST_METHOD prior to overriding" do
|
67
|
-
env = Rack::MockRequest.env_for("/",
|
68
|
-
:method => "POST",
|
69
|
-
:input => "_method=options")
|
70
|
-
app.call env
|
71
|
-
|
72
|
-
env["rack.methodoverride.original_method"].should.equal "POST"
|
73
|
-
end
|
74
|
-
|
75
|
-
should "not modify REQUEST_METHOD when given invalid multipart form data" do
|
76
|
-
input = <<EOF
|
77
|
-
--AaB03x\r
|
78
|
-
content-disposition: form-data; name="huge"; filename="huge"\r
|
79
|
-
EOF
|
80
|
-
env = Rack::MockRequest.env_for("/",
|
81
|
-
"CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
|
82
|
-
"CONTENT_LENGTH" => input.size.to_s,
|
83
|
-
:method => "POST", :input => input)
|
84
|
-
app.call env
|
85
|
-
|
86
|
-
env["REQUEST_METHOD"].should.equal "POST"
|
87
|
-
end
|
88
|
-
|
89
|
-
should "write error to RACK_ERRORS when given invalid multipart form data" do
|
90
|
-
input = <<EOF
|
91
|
-
--AaB03x\r
|
92
|
-
content-disposition: form-data; name="huge"; filename="huge"\r
|
93
|
-
EOF
|
94
|
-
env = Rack::MockRequest.env_for("/",
|
95
|
-
"CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
|
96
|
-
"CONTENT_LENGTH" => input.size.to_s,
|
97
|
-
"rack.errors" => StringIO.new,
|
98
|
-
:method => "POST", :input => input)
|
99
|
-
Rack::MethodOverride.new(proc { [200, {"Content-Type" => "text/plain"}, []] }).call env
|
100
|
-
|
101
|
-
env["rack.errors"].rewind
|
102
|
-
env["rack.errors"].read.should =~ /Bad request content body/
|
103
|
-
end
|
104
|
-
|
105
|
-
should "not modify REQUEST_METHOD for POST requests when the params are unparseable" do
|
106
|
-
env = Rack::MockRequest.env_for("/", :method => "POST", :input => "(%bad-params%)")
|
107
|
-
app.call env
|
108
|
-
|
109
|
-
env["REQUEST_METHOD"].should.equal "POST"
|
110
|
-
end
|
111
|
-
end
|