Overview
| Comment: | ofhttp: Parse unquoted Content-Disposition |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
ec962afb8e03da5c24b5e75e92448df1 |
| User & Date: | js on 2019-03-19 01:39:01 |
| Other Links: | manifest | tags |
Context
|
2019-03-19
| ||
| 22:23 | OFTCPSocket: Properly close socket on error check-in: 7d78a2b675 user: js tags: trunk | |
| 01:39 | ofhttp: Parse unquoted Content-Disposition check-in: ec962afb8e user: js tags: trunk | |
| 01:04 | ofhttp: Fix --detect-filename check-in: d112a476aa user: js tags: trunk | |
Changes
Modified utils/ofhttp/OFHTTP.m from [292d3ba59e] to [5a1e81f84f].
| ︙ | ︙ | |||
127 128 129 130 131 132 133 134 135 136 137 138 139 140 |
enum {
DISPOSITION_TYPE,
DISPOSITION_TYPE_SEMICOLON,
DISPOSITION_PARAM_NAME_SKIP_SPACE,
DISPOSITION_PARAM_NAME,
DISPOSITION_PARAM_VALUE,
DISPOSITION_PARAM_QUOTED,
DISPOSITION_EXPECT_SEMICOLON
} state;
size_t last;
OFString *type = nil, *paramName = nil, *paramValue;
OFMutableDictionary *params;
OFString *fileName;
| > | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 |
enum {
DISPOSITION_TYPE,
DISPOSITION_TYPE_SEMICOLON,
DISPOSITION_PARAM_NAME_SKIP_SPACE,
DISPOSITION_PARAM_NAME,
DISPOSITION_PARAM_VALUE,
DISPOSITION_PARAM_QUOTED,
DISPOSITION_PARAM_UNQUOTED,
DISPOSITION_EXPECT_SEMICOLON
} state;
size_t last;
OFString *type = nil, *paramName = nil, *paramValue;
OFMutableDictionary *params;
OFString *fileName;
|
| ︙ | ︙ | |||
189 190 191 192 193 194 195 |
}
break;
case DISPOSITION_PARAM_VALUE:
if (UTF8String[i] == '"') {
state = DISPOSITION_PARAM_QUOTED;
last = i + 1;
} else {
| > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 |
}
break;
case DISPOSITION_PARAM_VALUE:
if (UTF8String[i] == '"') {
state = DISPOSITION_PARAM_QUOTED;
last = i + 1;
} else {
state = DISPOSITION_PARAM_UNQUOTED;
last = i;
i--;
}
break;
case DISPOSITION_PARAM_QUOTED:
if (UTF8String[i] == '"') {
paramValue = [OFString
stringWithUTF8String: UTF8String + last
length: i - last];
[params setObject: paramValue
forKey: paramName.lowercaseString];
state = DISPOSITION_EXPECT_SEMICOLON;
}
break;
case DISPOSITION_PARAM_UNQUOTED:
if (UTF8String[i] <= 31 || UTF8String[i] >= 127)
return nil;
switch (UTF8String[i]) {
case ' ': case '"': case '(': case ')': case ',':
case '/': case ':': case '<': case '=': case '>':
case '?': case '@': case '[': case '\\': case ']':
case '{': case '}':
return nil;
case ';':
paramValue = [OFString
stringWithUTF8String: UTF8String + last
length: i - last];
[params setObject: paramValue
forKey: paramName.lowercaseString];
state = DISPOSITION_PARAM_NAME_SKIP_SPACE;
break;
}
break;
case DISPOSITION_EXPECT_SEMICOLON:
if (UTF8String[i] == ';') {
state = DISPOSITION_PARAM_NAME_SKIP_SPACE;
last = i + 1;
} else if (UTF8String[i] != ' ') {
objc_autoreleasePoolPop(pool);
return nil;
}
break;
}
}
if (state == DISPOSITION_PARAM_UNQUOTED) {
paramValue = [OFString
stringWithUTF8String: UTF8String + last
length: UTF8StringLength - last];
[params setObject: paramValue
forKey: paramName.lowercaseString];
} else if (state != DISPOSITION_EXPECT_SEMICOLON) {
objc_autoreleasePoolPop(pool);
return nil;
}
if (![type isEqual: @"attachment"] ||
(fileName = [params objectForKey: @"filename"]) == nil) {
objc_autoreleasePoolPop(pool);
|
| ︙ | ︙ |