Mini bugfix.

[z.facultad/75.42/plaqui.git] / Server / src / httpresponse.cpp

diff --git a/Server/src/httpresponse.cpp b/Server/src/httpresponse.cpp
index fb6ba7899bb1fe1c89aceb4381205a918c0a6490..2ae86a9b043890df97e37c45088ff4da9d7d6660 100644 (file)
--- a/Server/src/httpresponse.cpp
+++ b/Server/src/httpresponse.cpp
@@ -27,98 +27,118 @@
 
 #include "plaqui/server/httpresponse.h"
 #include "plaqui/server/string.h"
 
 #include "plaqui/server/httpresponse.h"
 #include "plaqui/server/string.h"

+#include <sstream>

 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::HTTPRequest::~HTTPResponse(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+HTTPResponse::~HTTPResponse(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": destructor." << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-PlaQui::Server::HTTPResponse::HTTPResponse(const std::string& version):
-               PlaQui::Server::HTTPMessage(version) {
+HTTPResponse::HTTPResponse(const string& body, const string& version):
+               HTTPMessage(body, version) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": http_version = " << http_version << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": body.length = " << body.length()
+               << " | version = " << version << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-/*
-PlaQui::Server::HTTPResponse::HTTPResponse(const Serializable& body,
-               const std::string& version):
-               PlaQui::Server::HTTPMessage(body, version) {
+HTTPResponse::HTTPResponse(const HTTPError& error):
+               status_code(error.code) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": http_version = " << http_version
-               << " | body = " << body.serialize() << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": HTTPError(status_code = " << error.code
+               << ", reason = " << HTTPMessage::reason(error.code) << ", desc = " << error.what()
+               << ")" << endl;

 #endif // DEBUG
 #endif // DEBUG

+       set_body(string("<response desc=\"") + error.what() + "\" />");

 }
 
 }
 

-PlaQui::Server::HTTPResponse::HTTPResponse(const std::string& uri,
-               const PlaQui::Server::HTTPResponse::HTTPMethod& method,
-               std::string& query, std::string& version):
-               PlaQui::Server::HTTPMessage(body, version) {
+HTTPResponse::HTTPResponse(unsigned status_code, const string& body):
+               HTTPMessage(body), status_code(status_code) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": http_version = " << http_version
-               << " | body = " << body.serialize() << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": status_code = " << status_code
+               << " | body.length = " << body.length() << endl;

 #endif // DEBUG
 }
 #endif // DEBUG
 }

-*/

 
 

-std::istream& operator>>(std::istream& is, PlaQui::Server::HTTPResponse& req) {
+istream& operator>>(istream& is, HTTPResponse& resp)
+               throw (HTTPResponse::Error, sockerr, ios::failure) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": operator>>()" << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": operator>>()" << endl;

 #endif // DEBUG
        char buf[BUFSIZ];
        // Obtengo primera línea (request)
 #endif // DEBUG
        char buf[BUFSIZ];
        // Obtengo primera línea (request)

-       is.getline(buf, BUFSIZ);
+       if (!is.getline(buf, BUFSIZ)) {
+               // Fin de archivo.
+               throw ios::failure("eof");
+       }

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << "Recibiendo linea: " << buf << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ":\tRecibiendo linea: " << buf << endl;

 #endif // DEBUG
 #endif // DEBUG

-       String line = buf;
+       String line(buf);

        // Si es la primera línea, es el request.
        // 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.
        }
        // Averiguo la versión.

-       std::string::size_type pos = line.find_first_of(String::SPACE_CHARS, 5);
-       std::string ver = line.substr(5, pos); 
+       string::size_type pos = line.find_first_of(String::SPACE_CHARS, 5);
+       string ver = line.substr(5, pos - 5); 

        if ((ver == "1.1") || (ver == "1.0")) {
        if ((ver == "1.1") || (ver == "1.0")) {

-               version = ver;
+               resp.version = ver;

        } else {
        } 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.
        }
        // Si tiene sólo la versión HTTP, no es válido.

-       line = line.substr(pos + 1).trim();
+       line = line.substr(pos + 1);
+       line.trim();

        if (!line.length()) {
        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);
        }
        // Si tiene más espacios, tengo la razón (reason).
        pos = line.find_first_of(String::SPACE_CHARS);

-       if (pos != std::string::npos) {
-               // Si el resto es un protocolo válido, agrego más variables.
-               String reas = line.substr(pos + 1).trim();
+       if (pos != string::npos) {
+               //FIXME String r = line.substr(pos + 1);
+               //resp.reason = r.trim();

                line = line.substr(0, pos);
        }
        line = line.trim();
        // Seteo el código.
                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) {
        if (line.length() != 3) {

-               // FIXME - poner excepciones lindas.
-               throw "Invalid response code";
+               throw HTTPResponse::INVALID_HTTP_RESPONSE_CODE;

        }
        }

-       stringstream ss = line; // TODO ver forma mas linda de convertir
-       ss >> status_code;
+       to(line, resp.status_code);
+       is >> static_cast<HTTPMessage&>(resp);
+       return is;

 }
 
 }
 

-std::ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPResponse& req) {
+ostream& operator<<(ostream& os, const HTTPResponse& resp) throw(sockerr) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": operator<<()" << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": operator<<()" << endl;

 #endif // DEBUG
 #endif // DEBUG

-       os << "HTTP/" << version << " " << status_code << " " << reason << "\r\l";
-       // TODO ver que este bien el \r\l
-       os << *(static_cast<HTTPMessage*>(this));
+       os << "HTTP/" << resp.version << " " << resp.status_code << " "
+               << HTTPMessage::reason(resp.status_code) << "\r\n";
+       os << static_cast<const HTTPMessage&>(resp);
+       return os;

 }
 
 }
 

+} // namespace Server
+
+} // namespace PlaQui
+