Changeset 3810 for trunk/gsdl/src/w32server/httpreq.cpp

Timestamp:

2003-03-09T09:08:58+13:00 (21 years ago)

Author:

sjboddie

Message:

Removed some hard string length limits in local library server code

File:

• trunk/gsdl/src/w32server/httpreq.cpp (modified) (10 diffs)

trunk/gsdl/src/w32server/httpreq.cpp

@@ -26 +26 @@
  *********************************************************************/
 
-#include "text_t.h"
 #include <windows.h>
 #include <stdlib.h>
@@ -32 +31 @@
 #include <string.h>
 #include <memory.h>
-#pragma hdrstop
+#include "httpreq.h"
 #include "parse.h"
 #include "netio.h"
 #include "settings.h"
-#include "httpreq.h" //Had to put myself here because of the global types...
 #include "httpsrv.h"
 #include "httpsend.h"
@@ -54 +52 @@
 #define IO_BUFFER_SIZE 16384        //16K IO Buffer
 #define MAX_HTTP_LINE_LEN 1024      //Max length of line in a header of 1024
-#define MAX_HTTP_FIELD_NAME_LEN 128 //Max length of name field in line
-#define MAX_HTTP_FIELD_LEN 1024     //Max length of data in line
 
 //Private Function Declarations with Return Contstants
@@ -219 +215 @@
 int GetHTTPHeaders(RequestInfoT &RequestInfo, RequestFieldsT &RequestFields) {
   //Parsing and IO buffers
-  char CurLine[NETIO_MAX_LINE];
-  char NextLine[NETIO_MAX_LINE];
-  char FieldNameStr[MAX_HTTP_FIELD_NAME_LEN];
-  char FieldValStr[MAX_HTTP_FIELD_LEN];
+  text_t CurLine;
+  text_t NextLine;
+  text_t FieldNameStr;
+  text_t FieldValStr;
   
   //Parsing and IO working vars
   int ReadBufferIndex;
   int DataInBuffer;
-  int Start;
-  int End;
-  int Len;
+  text_t::const_iterator next;
+  text_t::const_iterator end;
 
   //Clear all the fields
@@ -245 +240 @@
            RequestInfo.IOBufferSize, ReadBufferIndex, DataInBuffer,
            RequestInfo.ThreadNum) != 0) return GH_ERROR;
-    if ((NextLine[0] == ' ') || (NextLine[0] == '\t'))
-      strcat(CurLine, NextLine);
-  } while ((NextLine[0] == ' ') || (NextLine[0] == '\t'));
+    if ((*(NextLine.begin()) == ' ') || (*(NextLine.begin()) == '\t')) {
+      CurLine += NextLine;
+    }
+  } while ((*(NextLine.begin()) == ' ') || (*(NextLine.begin()) == '\t'));
   //Method String (first word)
-  Start = 0;
-  GetWord(RequestFields.MethodStr, CurLine, Start, End);
-  CharUpper(RequestFields.MethodStr);
+  GetWord(RequestFields.MethodStr, CurLine.begin(), CurLine.end(), next);
+  uc(RequestFields.MethodStr);
 
   /* Added Feb 2002 - IE since about version 5 send stupid frontpage requests
      for MS Document formats eg "GET /_vti_inf.html" */ 
-  if (strcmp(RequestFields.MethodStr,"OPTIONS")==0) {
-    return GH_BAD_METHOD;
+  if (RequestFields.MethodStr == "OPTIONS") {
+    return GH_BAD_METHOD;
   } 
   //Version String (last word)
-  GetLastWord(RequestFields.VersionStr, CurLine, Start);
-  CharUpper(RequestFields.VersionStr);
-
-  if (strncmp(RequestFields.VersionStr, "HTTP/", 5) != 0) {
+  GetLastWord(RequestFields.VersionStr, CurLine.begin(), CurLine.end(), end);
+  uc(RequestFields.VersionStr);
+  text_t::const_iterator versionbegin = RequestFields.VersionStr.begin();
+
+  if ((RequestFields.VersionStr.size() > 5) && (substr(versionbegin, versionbegin+5) != "HTTP/")) {
     //No version, assume simple request
     //part after method is URI
-    for (int i = 0; i < strlen(CurLine); i++) {
-      RequestFields.URIStr.push_back(CurLine[i]);
-    }
+    RequestFields.URIStr = CurLine;
     return GH_SIMPLE_REQUEST;
   }
@@ -273 +267 @@
   //URI String (in between End of first and Start of last)
   //<Method> <WhiteSpace> <URI> <WhiteSpace> <Version> <CRLF>
-  //                  End^             Start^
+  //                  next^             end^
   text_t spacebuffer;
-  for (int i = End; i < Start; i++) {
+  text_t::const_iterator here = next;
+  while (here != end) {
     // do this to remove trailing space
-    if (CurLine[i] == ' ') {
-      spacebuffer.push_back(' ');
+    if (*here == ' ' || *here == '\t') {
+      spacebuffer.push_back(*here);
     } else {
       if (!spacebuffer.empty()) {
@@ -284 +279 @@
     spacebuffer.clear();
       }
-      RequestFields.URIStr.push_back(CurLine[i]);
-    }
+      RequestFields.URIStr.push_back(*here);
+    }
+    here++;
   }
 
   //Only accept requests from HTTP/0.9 or HTTP/1.X clients, we'll
   //assume that anything else will require an upgrade or patch
-  if (strncmp(RequestFields.VersionStr, "HTTP/1.", 7) != 0)
+  if ((RequestFields.VersionStr.size() > 7) && (substr(versionbegin, versionbegin+7) != "HTTP/1.")) {
     return GH_UNKNOWN_VERSION;
+  }
   
   //Get the rest of the lines
-  
-  strcpy(CurLine, NextLine);
-  
-  while (CurLine[0] != 0) {//Blank Line, we're done
+  CurLine = NextLine;
+  
+  while (!CurLine.empty()) {//Blank Line, we're done
     do {//Get Next Line, append it if the first charactor is space
       if (GetLine(NextLine, RequestInfo.ClientSocket, RequestInfo.IOBuffer,
@@ -303 +299 @@
           RequestInfo.ThreadNum) != 0)
     return GH_ERROR;
-      if ((NextLine[0] == ' ') || (NextLine[0] == '\t'))
-    strcat(CurLine, NextLine);
-    } while ((NextLine[0] == ' ') || (NextLine[0] == '\t'));
+      if ((*(NextLine.begin()) == ' ') || (*(NextLine.begin()) == '\t')) {
+    CurLine += NextLine;
+      }
+    } while ((*(NextLine.begin()) == ' ') || (*(NextLine.begin()) == '\t'));
     
-    Start = 0;
-    GetWord(FieldNameStr, CurLine, Start, End);
-    CharUpper(FieldNameStr);
+    GetWord(FieldNameStr, CurLine.begin(), CurLine.end(), next);
+    uc(FieldNameStr);
     
-    Len = strlen(CurLine) - End;
-    memcpy(FieldValStr, CurLine + End, Len);
-    FieldValStr[Len] = 0;
+    FieldValStr = substr(next, CurLine.end());
     
     //Process it
@@ -319 +313 @@
     //All constants are in canonized, thus in upper case and case sensitive
     //comparisons are used
+
     //--Just About Always--
-    if (strcmp("ACCEPT:", FieldNameStr) == 0) {
-      if (RequestFields.AcceptStr[0] == '\0') {
-        strncpy(RequestFields.AcceptStr, FieldValStr, ReqAcceptStrLen - 1);
-      }
-      else {
-        //Append it with a comma
-        int AcceptStrLen = strlen(RequestFields.AcceptStr);
-        if ((ReqAcceptStrLen - AcceptStrLen) >= 10) {
-          strncat(RequestFields.AcceptStr, ", ", ReqAcceptStrLen - AcceptStrLen - 1);
-          strncat(RequestFields.AcceptStr, FieldValStr, ReqAcceptStrLen - AcceptStrLen - 3);
-    }
-      }
-    }
-    else if (strcmp("DATE:", FieldNameStr) == 0) {
-      strncpy(RequestFields.DateStr, FieldValStr, ReqDateStrLen - 1);
-    }
-    else if (strcmp("USER-AGENT:", FieldNameStr) == 0) {
-      strncpy(RequestFields.UserAgentStr, FieldValStr, ReqUserAgentStrLen - 1);
-    }
-    else if (strcmp("CONNECTION:", FieldNameStr) == 0) {
-      strncpy(RequestFields.ConnectionStr, FieldValStr, ReqConnectionStrLen - 1);
+    if (FieldNameStr == "ACCEPT:") {
+      if (!RequestFields.AcceptStr.empty()) {
+    RequestFields.AcceptStr += ", ";
+      }
+      RequestFields.AcceptStr += FieldValStr;
+    }
+    else if (FieldNameStr == "DATE:") {
+      RequestFields.DateStr = FieldValStr;
+    }
+    else if (FieldNameStr == "USER-AGENT:") {
+      RequestFields.UserAgentStr = FieldValStr;
+    }
+    else if (FieldNameStr == "CONNECTION:") {
+      RequestFields.ConnectionStr = FieldValStr;
     }
     //--Sometimes--
-    else if (strcmp("ACCEPT-LANGUAGE:", FieldNameStr) == 0) {
-      strncpy(RequestFields.AcceptLangStr, FieldValStr, ReqAcceptLangStrLen - 1);
-    }
-    else if (strcmp("REFERER:", FieldNameStr) == 0) {
-      strncpy(RequestFields.RefererStr, FieldValStr, ReqRefererStrLen - 1);
-    }
-    else if (strcmp("IF-MODIFIED-SINCE:", FieldNameStr) == 0) {
-      strncpy(RequestFields.IfModSinceStr, FieldValStr, ReqIfModSinceStrLen - 1);
+    else if (FieldNameStr == "ACCEPT-LANGUAGE:") {
+      RequestFields.AcceptLangStr = FieldValStr;
+    }
+    else if (FieldNameStr == "REFERER:") {
+      RequestFields.RefererStr = FieldValStr;
+    }
+    else if (FieldNameStr == "IF-MODIFIED-SINCE:") {
+      RequestFields.IfModSinceStr = FieldValStr;
     }
     //--Uncommon--
-    else if (strcmp("FROM:", FieldNameStr) == 0) {
-      strncpy(RequestFields.FromStr, FieldValStr, ReqFromStrLen - 1);
-    }
-    else if (strcmp("MIME-VERSION:", FieldNameStr) == 0) {
-      strncpy(RequestFields.MIMEVerStr, FieldValStr, ReqMIMEVerStrLen - 1);
-    }
-    else if (strcmp("PRAGMA:", FieldNameStr) == 0) {
-      strncpy(RequestFields.PragmaStr, FieldValStr, ReqPragmaStrLen - 1);
+    else if (FieldNameStr == "FROM:") {
+      RequestFields.FromStr = FieldValStr;
+    }
+    else if (FieldNameStr == "MIME-VERSION:") {
+      RequestFields.MIMEVerStr = FieldValStr;
+    }
+    else if (FieldNameStr == "PRAGMA:") {
+      RequestFields.PragmaStr = FieldValStr;
     }
     //--Special case--
-    else if (strcmp("AUTHORIZATION:", FieldNameStr) == 0) {
-      strncpy(RequestFields.AuthorizationStr, FieldValStr, ReqAuthorizationStrLen - 1);
-    }
-    else if (strcmp("CONTENT-LENGTH:", FieldNameStr) == 0) {
-      strncpy(RequestFields.ContentLengthStr, FieldValStr, ReqContentLengthStrLen - 1);
-    }
-    else if (strcmp("CONTENT-TYPE:", FieldNameStr) == 0) {
-      strncpy(RequestFields.ContentTypeStr, FieldValStr, ReqContentTypeStrLen - 1);
-    }
-    else if (strcmp("CONTENT-ENCODING:", FieldNameStr) == 0) {
-      strncpy(RequestFields.ContentEncodingStr, FieldValStr, ReqContentEncodingStrLen - 1);
-    }
-    else {
+    else if (FieldNameStr == "AUTHORIZATION:") {
+      RequestFields.AuthorizationStr = FieldValStr;
+    }
+    else if (FieldNameStr == "CONTENT-LENGTH:") {
+      RequestFields.ContentLengthStr = FieldValStr;
+    }
+    else if (FieldNameStr == "CONTENT-TYPE:") {
+      RequestFields.ContentTypeStr = FieldValStr;
+    }
+    else if (FieldNameStr == "CONTENT-ENCODING:") {
+      RequestFields.ContentEncodingStr = FieldValStr;
+    }
+    else if (!FieldNameStr.empty()) {
       //Add it to the other headers
-      int VarLen = strlen(FieldNameStr);
-      if (FieldNameStr[VarLen - 1] == ':') {
-    //Remove the colon
-    FieldNameStr[VarLen - 1] = '\0';
-    VarLen--;
-      }
-      RequestFields.OtherHeaders[RequestFields.NumOtherHeaders].Var = new char[VarLen + 1];
-      RequestFields.OtherHeaders[RequestFields.NumOtherHeaders].Val = new char[Len + 1];
-      strcpy(RequestFields.OtherHeaders[RequestFields.NumOtherHeaders].Var, FieldNameStr);
-      strcpy(RequestFields.OtherHeaders[RequestFields.NumOtherHeaders].Val, FieldValStr);
+
+      //Remove the colon
+      if (*(FieldNameStr.end()-1) == ':') {
+    FieldNameStr.pop_back();
+      }
+      RequestFields.OtherHeaders[RequestFields.NumOtherHeaders].Var = FieldNameStr;
+      RequestFields.OtherHeaders[RequestFields.NumOtherHeaders].Val = FieldValStr;
       RequestFields.NumOtherHeaders++;
     }
-    strcpy(CurLine, NextLine);
-  }
-  
-  if (RequestFields.ContentLengthStr[0] != 0) { //Do we have attached data?
+    CurLine = NextLine;
+  }
+  
+  if (!RequestFields.ContentLengthStr.empty()) { //Do we have attached data?
     unsigned int NumRecv;
     
-    RequestFields.ContentLength = atol(RequestFields.ContentLengthStr);
+    RequestFields.ContentLength = RequestFields.ContentLengthStr.getint();
     if (RequestFields.ContentLength > 0) {
 
@@ -447 +432 @@
 void CleanUpHTTPHeaders(RequestInfoT &RequestInfo, RequestFieldsT &RequestFields) {
   //Clean up memory allocated for the Content
-  if (RequestFields.Content != NULL)
+  if (RequestFields.Content != NULL) {
     delete[] RequestFields.Content;
-  while (RequestFields.NumOtherHeaders > 0) {
-    RequestFields.NumOtherHeaders--;
-    delete[] RequestFields.OtherHeaders[RequestFields.NumOtherHeaders].Var;
-    delete[] RequestFields.OtherHeaders[RequestFields.NumOtherHeaders].Val;
   }