Overview
Comment: | Add OFHTTPServer. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
190b9d3a5cd6af10568bbab9bfd7c452 |
User & Date: | js on 2012-12-11 12:12:34 |
Other Links: | manifest | tags |
Context
2012-12-11
| ||
12:22 | configure: Only add -no-integrated-as for Clang. check-in: 20a020da0e user: js tags: trunk | |
12:12 | Add OFHTTPServer. check-in: 190b9d3a5c user: js tags: trunk | |
12:12 | OFURL: Add +[URL]. check-in: 12a4d43f67 user: js tags: trunk | |
Changes
Modified src/Makefile from [c26c9d673c] to [eac717c730].
︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 | OFDate.m \ OFDictionary.m \ OFEnumerator.m \ OFFile.m \ OFHash.m \ OFHTTPClient.m \ OFHTTPRequest.m \ OFIntrospection.m \ OFList.m \ OFMapTable.m \ OFMD5Hash.m \ OFMutableArray.m \ OFMutableDictionary.m \ OFMutableSet.m \ | > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | OFDate.m \ OFDictionary.m \ OFEnumerator.m \ OFFile.m \ OFHash.m \ OFHTTPClient.m \ OFHTTPRequest.m \ OFHTTPServer.m \ OFIntrospection.m \ OFList.m \ OFMapTable.m \ OFMD5Hash.m \ OFMutableArray.m \ OFMutableDictionary.m \ OFMutableSet.m \ |
︙ | ︙ |
Added src/OFHTTPServer.h version [a5be6ab75a].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" @class OFHTTPServer; @class OFHTTPRequest; @class OFHTTPRequestResult; @class OFTCPSocket; @class OFException; /*! * @brief A delegate for OFHTTPServer. */ @protocol OFHTTPServerDelegate <OFObject> /*! * @brief This method is called when the HTTP server received a request from a * client. * * @param server The HTTP server which received the request * @param request The request the HTTP server received * @return The result the HTTP server should send to the client */ - (OFHTTPRequestResult*)server: (OFHTTPServer*)server didReceiveRequest: (OFHTTPRequest*)request; @end /*! * @brief A class for creating a simple HTTP server inside of applications. */ @interface OFHTTPServer: OFObject { OFString *host; uint16_t port; id <OFHTTPServerDelegate> delegate; OFTCPSocket *listeningSocket; } #ifdef OF_HAVE_PROPERTIES @property (copy) OFString *host; @property uint16_t port; @property (assign) id <OFHTTPServerDelegate> delegate; #endif /*! * @brief Creates a new HTTP server. * * @return A new HTTP server */ + (instancetype)server; /*! * @brief Sets the host on which the HTTP server will listen. * * @param host The host to listen on */ - (void)setHost: (OFString*)host; /*! * @brief Returns the host on which the HTTP server will listen. * * @return The host on which the HTTP server will listen */ - (OFString*)host; /*! * @brief Sets the port on which the HTTP server will listen. * * @param port The port to listen on */ - (void)setPort: (uint16_t)port; /*! * @brief Returns the port on which the HTTP server will listen. * * @return The port on which the HTTP server will listen */ - (uint16_t)port; /*! * @brief Sets the delegate for the HTTP server. * * @param delegate The delegate for the HTTP server */ - (void)setDelegate: (id <OFHTTPServerDelegate>)delegate; /*! * @brief Returns the delegate for the HTTP server. * * @return The delegate for the HTTP server */ - (id <OFHTTPServerDelegate>)delegate; /*! * @brief Starts the HTTP server in the current thread's runloop. */ - (void)start; - (BOOL)OF_socket: (OFTCPSocket*)socket didAcceptSocket: (OFTCPSocket*)clientSocket exception: (OFException*)exception; @end @interface OFObject (OFHTTPServerDelegate) <OFHTTPServerDelegate> @end |
Added src/OFHTTPServer.m version [019519d771].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 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 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <string.h> #include <ctype.h> #import "OFHTTPServer.h" #import "OFDataArray.h" #import "OFDate.h" #import "OFDictionary.h" #import "OFURL.h" #import "OFHTTPRequest.h" #import "OFTCPSocket.h" #import "OFAlreadyConnectedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFNotImplementedException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "OFWriteFailedException.h" #import "macros.h" #define BUFFER_SIZE 1024 /* * FIXME: Currently, connections never time out, which means a DoS is possible. * TODO: Add support for chunked transfer encoding. * FIXME: Key normalization replaces headers like "DNT" with "Dnt". * FIXME: It is currently not possible to stop the server. * FIXME: Errors are not reported to the user. */ static const char* status_code_to_string(short code) { switch (code) { case 100: return "Continue"; case 101: return "Switching Protocols"; case 200: return "OK"; case 201: return "Created"; case 202: return "Accepted"; case 203: return "Non-Authoritative Information"; case 204: return "No Content"; case 205: return "Reset Content"; case 206: return "Partial Content"; case 300: return "Multiple Choices"; case 301: return "Moved Permanently"; case 302: return "Found"; case 303: return "See Other"; case 304: return "Not Modified"; case 305: return "Use Proxy"; case 307: return "Temporary Redirect"; case 400: return "Bad Request"; case 401: return "Unauthorized"; case 402: return "Payment Required"; case 403: return "Forbidden"; case 404: return "Not Found"; case 405: return "Method Not Allowed"; case 406: return "Not Acceptable"; case 407: return "Proxy Authentication Required"; case 408: return "Request Timeout"; case 409: return "Conflict"; case 410: return "Gone"; case 411: return "Length Required"; case 412: return "Precondition Failed"; case 413: return "Request Entity Too Large"; case 414: return "Request-URI Too Long"; case 415: return "Unsupported Media Type"; case 416: return "Requested Range Not Satisfiable"; case 417: return "Expectation Failed"; case 500: return "Internal Server Error"; case 501: return "Not Implemented"; case 502: return "Bad Gateway"; case 503: return "Service Unavailable"; case 504: return "Gateway Timeout"; case 505: return "HTTP Version Not Supported"; default: return NULL; } } static OF_INLINE OFString* normalized_key(OFString *key) { char *cString = strdup([key UTF8String]); char *tmp = cString; BOOL firstLetter = YES; if (cString == NULL) @throw [OFOutOfMemoryException exceptionWithClass: nil requestedSize: strlen([key UTF8String])]; while (*tmp != '\0') { if (!isalnum(*tmp)) { firstLetter = YES; tmp++; continue; } *tmp = (firstLetter ? toupper(*tmp) : tolower(*tmp)); firstLetter = NO; tmp++; } return [OFString stringWithUTF8StringNoCopy: cString freeWhenDone: YES]; } @interface OFHTTPServer_Connection: OFObject { OFTCPSocket *sock; OFHTTPServer *server; enum { AWAITING_PROLOG, PARSING_HEADERS, SEND_REPLY } state; uint8_t HTTPMinorVersion; of_http_request_type_t requestType; OFString *host, *path; uint16_t port; OFMutableDictionary *headers; size_t contentLength; OFDataArray *postData; } - initWithSocket: (OFTCPSocket*)socket server: (OFHTTPServer*)server; - (BOOL)socket: (OFTCPSocket*)sock didReadLine: (OFString*)line exception: (OFException*)exception; - (BOOL)parseProlog: (OFString*)line; - (BOOL)parseHeaders: (OFString*)line; - (BOOL)socket: (OFTCPSocket*)sock didReadIntoBuffer: (const char*)buffer length: (size_t)length exception: (OFException*)exception; - (BOOL)sendErrorAndClose: (short)statusCode; - (void)sendReply; @end @implementation OFHTTPServer_Connection - initWithSocket: (OFTCPSocket*)sock_ server: (OFHTTPServer*)server_ { self = [super init]; sock = [sock_ retain]; server = server_; state = AWAITING_PROLOG; return self; } - (void)dealloc { [sock release]; [host release]; [path release]; [headers release]; [postData release]; [super dealloc]; } - (BOOL)socket: (OFTCPSocket*)sock_ didReadLine: (OFString*)line exception: (OFException*)exception { if (line == nil || exception != nil) return NO; @try { switch (state) { case AWAITING_PROLOG: return [self parseProlog: line]; case PARSING_HEADERS: if (![self parseHeaders: line]) return NO; if (state == SEND_REPLY) { [self sendReply]; return NO; } return YES; default: return NO; } } @catch (OFWriteFailedException *e) { return NO; } } - (BOOL)parseProlog: (OFString*)line { OFString *type; size_t pos; @try { OFString *version = [line substringWithRange: of_range([line length] - 9, 9)]; of_unichar_t tmp; if (![version hasPrefix: @" HTTP/1."]) return [self sendErrorAndClose: 505]; tmp = [version characterAtIndex: 8]; if (tmp < '0' || tmp > '9') return [self sendErrorAndClose: 400]; HTTPMinorVersion = (uint8_t)(tmp - '0'); } @catch (OFOutOfRangeException *e) { return [self sendErrorAndClose: 400]; } pos = [line rangeOfString: @" "].location; if (pos == OF_NOT_FOUND) return [self sendErrorAndClose: 400]; type = [line substringWithRange: of_range(0, pos)]; if ([type isEqual: @"GET"]) requestType = OF_HTTP_REQUEST_TYPE_GET; else if ([type isEqual: @"POST"]) requestType = OF_HTTP_REQUEST_TYPE_POST; else if ([type isEqual: @"HEAD"]) requestType = OF_HTTP_REQUEST_TYPE_HEAD; else return [self sendErrorAndClose: 501]; @try { path = [[line substringWithRange: of_range(pos + 1, [line length] - pos - 10)] retain]; } @catch (OFOutOfRangeException *e) { return [self sendErrorAndClose: 400]; } if (![path hasPrefix: @"/"]) return [self sendErrorAndClose: 400]; headers = [[OFMutableDictionary alloc] init]; state = PARSING_HEADERS; return YES; } - (BOOL)parseHeaders: (OFString*)line { OFString *key, *value; size_t pos; if ([line isEqual: @""]) { switch (requestType) { case OF_HTTP_REQUEST_TYPE_GET: case OF_HTTP_REQUEST_TYPE_HEAD: state = SEND_REPLY; break; case OF_HTTP_REQUEST_TYPE_POST:; OFString *tmp; char *buffer; tmp = [headers objectForKey: @"Content-Length"]; if (tmp == nil) return [self sendErrorAndClose: 411]; @try { contentLength = (size_t)[tmp decimalValue]; } @catch (OFInvalidFormatException *e) { return [self sendErrorAndClose: 400]; } buffer = [self allocMemoryWithSize: BUFFER_SIZE]; postData = [[OFDataArray alloc] init]; [sock asyncReadIntoBuffer: buffer length: BUFFER_SIZE target: self selector: @selector(socket: didReadIntoBuffer: length:exception:)]; return NO; } return YES; } pos = [line rangeOfString: @":"].location; if (pos == OF_NOT_FOUND) return [self sendErrorAndClose: 400]; key = [line substringWithRange: of_range(0, pos)]; value = [line substringWithRange: of_range(pos + 1, [line length] - pos - 1)]; key = normalized_key([key stringByDeletingTrailingWhitespaces]); value = [value stringByDeletingLeadingWhitespaces]; [headers setObject: value forKey: key]; if ([key isEqual: @"Host"]) { pos = [value rangeOfString: @":" options: OF_STRING_SEARCH_BACKWARDS].location; if (pos != OF_NOT_FOUND) { host = [[value substringWithRange: of_range(0, pos)] retain]; @try { of_range_t range = of_range(pos + 1, [value length] - pos - 1); intmax_t portTmp = [[value substringWithRange: range] decimalValue]; if (portTmp < 1 || portTmp > UINT16_MAX) return [self sendErrorAndClose: 400]; port = (uint16_t)portTmp; } @catch (OFInvalidFormatException *e) { return [self sendErrorAndClose: 400]; } } else { host = [value retain]; port = 80; } } return YES; } - (BOOL)socket: (OFTCPSocket*)sock_ didReadIntoBuffer: (const char*)buffer length: (size_t)length exception: (OFException*)exception { if ([sock_ isAtEndOfStream] || exception != nil) return NO; [postData addItemsFromCArray: buffer count: length]; if ([postData count] >= contentLength) { @try { [self sendReply]; } @catch (OFWriteFailedException *e) { return NO; } return NO; } return YES; } - (BOOL)sendErrorAndClose: (short)statusCode { OFString *date = [[OFDate date] dateStringWithFormat: @"%a, %d %b %Y %H:%M:%S GMT"]; [sock writeFormat: @"HTTP/1.1 %d %s\r\n" @"Date: %@\r\n" @"Server: OFHTTPServer (ObjFW's HTTP server class, " @"<https://webkeks.org/objfw/>)\r\n\r\n", statusCode, status_code_to_string(statusCode), date]; [sock close]; return NO; } - (void)sendReply { OFURL *URL; OFHTTPRequest *request; OFHTTPRequestResult *reply; OFDictionary *replyHeaders; OFDataArray *replyData; OFEnumerator *keyEnumerator, *valueEnumerator; OFString *key, *value; if (host == nil || port == 0) { if (HTTPMinorVersion > 0) { [self sendErrorAndClose: 400]; return; } host = [server host]; port = [server port]; } URL = [OFURL URL]; [URL setScheme: @"http"]; [URL setHost: host]; [URL setPort: port]; [URL setPath: path]; request = [OFHTTPRequest requestWithURL: URL]; [request setRequestType: requestType]; [request setHeaders: headers]; [request setPostData: postData]; reply = [[server delegate] server: server didReceiveRequest: request]; if (reply == nil) { [self sendErrorAndClose: 500]; @throw [OFInvalidArgumentException exceptionWithClass: [[server delegate] class] selector: @selector(server:didReceiveRequest:)]; } replyHeaders = [reply headers]; replyData = [reply data]; [sock writeFormat: @"HTTP/1.1 %d %s\r\n" @"Server: OFHTTPServer (ObjFW's HTTP server class, " @"<https://webkeks.org/objfw/>)\r\n", [reply statusCode], status_code_to_string([reply statusCode])]; if (requestType != OF_HTTP_REQUEST_TYPE_HEAD) [sock writeFormat: @"Content-Length: %zu\r\n", [replyData count] * [replyData itemSize]]; keyEnumerator = [replyHeaders keyEnumerator]; valueEnumerator = [replyHeaders objectEnumerator]; while ((key = [keyEnumerator nextObject]) != nil && (value = [valueEnumerator nextObject]) != nil) [sock writeFormat: @"%@: %@\r\n", key, value]; [sock writeString: @"\r\n"]; if (requestType != OF_HTTP_REQUEST_TYPE_HEAD) [sock writeBuffer: [replyData cArray] length: [replyData count] * [replyData itemSize]]; } @end @implementation OFHTTPServer + (instancetype)server { return [[[self alloc] init] autorelease]; } - (void)dealloc { [host release]; [listeningSocket release]; [super dealloc]; } - (void)setHost: (OFString*)host_ { OF_SETTER(host, host_, YES, 1) } - (OFString*)host { OF_GETTER(host, YES) } - (void)setPort: (uint16_t)port_ { port = port_; } - (uint16_t)port { return port; } - (void)setDelegate: (id <OFHTTPServerDelegate>)delegate_ { delegate = delegate_; } - (id <OFHTTPServerDelegate>)delegate { return delegate; } - (void)start { if (host == nil || port == 0) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; if (listeningSocket != nil) @throw [OFAlreadyConnectedException exceptionWithClass: [self class] socket: listeningSocket]; listeningSocket = [[OFTCPSocket alloc] init]; [listeningSocket bindToHost: host port: port]; [listeningSocket listen]; [listeningSocket asyncAcceptWithTarget: self selector: @selector(OF_socket: didAcceptSocket: exception:)]; } - (BOOL)OF_socket: (OFTCPSocket*)socket didAcceptSocket: (OFTCPSocket*)clientSocket exception: (OFException*)exception { OFHTTPServer_Connection *connection; if (exception != nil) return NO; connection = [[[OFHTTPServer_Connection alloc] initWithSocket: clientSocket server: self] autorelease]; [clientSocket asyncReadLineWithTarget: connection selector: @selector(socket:didReadLine: exception:)]; return YES; } @end @implementation OFObject (OFHTTPServerDelegate) - (OFHTTPRequestResult*)server: (OFHTTPServer*)server didReceiveRequest: (OFHTTPRequest*)request { @throw [OFNotImplementedException exceptionWithClass: [self class] selector: _cmd]; } @end |
Modified src/ObjFW.h from [883aacb44f] to [b5cd66bf5f].
︙ | ︙ | |||
50 51 52 53 54 55 56 57 58 59 60 61 62 63 | #import "OFTCPSocket.h" #import "OFTLSSocket.h" #import "OFProcess.h" #import "OFStreamObserver.h" #import "OFHTTPRequest.h" #import "OFHTTPClient.h" #import "OFHash.h" #import "OFMD5Hash.h" #import "OFSHA1Hash.h" #import "OFXMLAttribute.h" #import "OFXMLElement.h" | > | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | #import "OFTCPSocket.h" #import "OFTLSSocket.h" #import "OFProcess.h" #import "OFStreamObserver.h" #import "OFHTTPRequest.h" #import "OFHTTPClient.h" #import "OFHTTPServer.h" #import "OFHash.h" #import "OFMD5Hash.h" #import "OFSHA1Hash.h" #import "OFXMLAttribute.h" #import "OFXMLElement.h" |
︙ | ︙ |