X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/b92547a5de3a3fb4f14a2bea4a4e776b8da3cb5c..3a8788fb198a1e0590823745f39fbff81056db09:/Server/src/httpresponse.cpp?ds=sidebyside diff --git a/Server/src/httpresponse.cpp b/Server/src/httpresponse.cpp index 5a5b246..46cc55e 100644 --- a/Server/src/httpresponse.cpp +++ b/Server/src/httpresponse.cpp @@ -44,78 +44,77 @@ HTTPResponse::~HTTPResponse(void) { #endif // DEBUG } -HTTPResponse::HTTPResponse(const string& version): - HTTPMessage(version) { +HTTPResponse::HTTPResponse(const string& body, const string& version): + HTTPMessage(body, version) { #ifdef DEBUG - cerr << __FILE__ << ": version = " << version << endl; + cerr << __FILE__ << ": body.length = " << body.length() + << " | version = " << version << endl; #endif // DEBUG } -/* -HTTPResponse::HTTPResponse(const Serializable& body, - const string& version): - HTTPMessage(body, version) { +HTTPResponse::HTTPResponse(const HTTPError& error): + status_code(error.code) { #ifdef DEBUG - cerr << __FILE__ << ": http_version = " << http_version - << " | body = " << body.serialize() << endl; + cerr << __FILE__ << ": HTTPError(status_code = " << error.code + << ", reason = " << HTTPMessage::reason(error.code) << ", desc = " << error.what() + << ")" << endl; #endif // DEBUG + set_body(string(""); } -HTTPResponse::HTTPResponse(const string& uri, - const HTTPResponse::HTTPMethod& method, - string& query, string& version): - HTTPMessage(body, version) { +HTTPResponse::HTTPResponse(unsigned status_code, const string& body): + HTTPMessage(body), status_code(status_code) { #ifdef DEBUG - cerr << __FILE__ << ": http_version = " << http_version - << " | body = " << body.serialize() << endl; + cerr << __FILE__ << ": status_code = " << status_code + << " | body.length = " << body.length() << endl; #endif // DEBUG } -*/ -istream& operator>>(istream& is, HTTPResponse& resp) { +istream& operator>>(istream& is, HTTPResponse& resp) + throw (HTTPResponse::Error, ios::failure) { #ifdef DEBUG cerr << __FILE__ << ": operator>>()" << endl; #endif // DEBUG char buf[BUFSIZ]; // Obtengo primera línea (request) - is.getline(buf, BUFSIZ); + if (!is.getline(buf, BUFSIZ)) { + // No hay mas líneas. + throw ios::failure("socket closed"); + } #ifdef DEBUG - cerr << "Recibiendo linea: " << buf << endl; + cerr << __FILE__ << ":\tRecibiendo linea: " << buf << endl; #endif // DEBUG String line(buf); // Si es la primera línea, es el request. - if (line.to_upper().substr(0, 4) != "HTTP/") { - // FIXME - poner excepciones lindas. - throw "Not a HTTP response"; + if (String(line.substr(0, 5)).to_upper() != "HTTP/") { + throw HTTPResponse::INVALID_HTTP_RESPONSE; } // Averiguo la versión. string::size_type pos = line.find_first_of(String::SPACE_CHARS, 5); - string ver = line.substr(5, pos); + string ver = line.substr(5, pos - 5); if ((ver == "1.1") || (ver == "1.0")) { resp.version = ver; } else { - // FIXME - poner excepciones lindas. - throw "Invalid HTTP version"; + throw HTTPResponse::INVALID_HTTP_VERSION; } // Si tiene sólo la versión HTTP, no es válido. line = line.substr(pos + 1); line.trim(); if (!line.length()) { - // FIXME - poner excepciones lindas. - throw "Invalid HTTP response"; + throw HTTPResponse::MISSING_HTTP_RESPONSE_CODE; } // Si tiene más espacios, tengo la razón (reason). pos = line.find_first_of(String::SPACE_CHARS); if (pos != string::npos) { - String r = line.substr(pos + 1); - resp.reason = r.trim(); + //FIXME String r = line.substr(pos + 1); + //resp.reason = r.trim(); line = line.substr(0, pos); } line = line.trim(); // Seteo el código. + // TODO - chequear el codigo a ver si pertenece a uno definido en la RFC. if (line.length() != 3) { - // FIXME - poner excepciones lindas. - throw "Invalid response code"; + throw HTTPResponse::INVALID_HTTP_RESPONSE_CODE; } stringstream ss; ss << line; // TODO ver forma mas linda de convertir @@ -128,8 +127,8 @@ ostream& operator<<(ostream& os, const HTTPResponse& resp) { #ifdef DEBUG cerr << __FILE__ << ": operator<<()" << endl; #endif // DEBUG - os << "HTTP/" << resp.version << " " << resp.status_code << " " << resp.reason << "\r\n"; - // TODO ver que este bien el \r\l + os << "HTTP/" << resp.version << " " << resp.status_code << " " + << HTTPMessage::reason(resp.status_code) << "\r\n"; os << static_cast(resp); return os; }