Commit 11160b5a authored by jan.koester's avatar jan.koester
Browse files

test

parent 9a46b757

src/api.cpp

+8 −3
Changes for src/api.cpp: 8 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -753,10 +753,15 @@ public: 
        json_object *jrequest = nullptr, *jresponse = nullptr;



        if (!(jrequest = json_tokener_parse_verbose(recv.data(), &jerr))) {

            json_object *jerrArr = json_object_new_array();

            json_object *eobj = json_object_new_object();

            json_object_object_add(eobj,"error",json_object_new_string(json_tokener_error_desc(jerr)));

            json_object_array_add(jerrArr,eobj);

            const char *errstr = json_object_to_json_string(jerrArr);

            rep.setState(HTTP500);

            rep.setContentType("text/txt");

            const char* err = json_tokener_error_desc(jerr);

            rep.send(curreq, err, strlen(err));

            rep.setContentType("application/json");

            rep.send(curreq, errstr, strlen(errstr));

            json_object_put(jerrArr);

            return;

        }

src/authdb.cpp

+15 −9
Changes for src/authdb.cpp: 15 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -284,8 +284,8 @@ namespace authdb { 
                    if(did.parse(domain)!=0){

                        libhttppp::HttpResponse rep;

                        rep.setState(HTTP500);

                        rep.setContentType("text/html");

                        rep.send(curreq,"can't parse domain id",21);

                        rep.setContentType("application/json");

                        rep.send(curreq,"[{\"error\":\"can't parse domain id\"}]",36);

                        return;

                    }
@@ -293,16 +293,23 @@ namespace authdb { 
                    try {

                        apidb = getDomainBackend(did);

                    }catch(std::exception &e){

                        g_Log.error(clientAddr,e.what());

                        json_object *jerr = json_object_new_array();

                        json_object *eobj = json_object_new_object();

                        json_object_object_add(eobj,"error",json_object_new_string(e.what()));

                        json_object_array_add(jerr,eobj);

                        const char *errstr = json_object_to_json_string(jerr);

                        libhttppp::HttpResponse rep;

                        rep.setState(HTTP500);

                        rep.setContentType("text/html");

                        rep.send(curreq,e.what(),strlen(e.what()));

                        rep.setContentType("application/json");

                        rep.send(curreq,errstr,strlen(errstr));

                        json_object_put(jerr);

                        return;

                    }catch(...){

                        libhttppp::HttpResponse rep;

                        rep.setState(HTTP500);

                        rep.setContentType("text/html");

                        rep.send(curreq,"internal error loading domain",29);

                        rep.setContentType("application/json");

                        rep.send(curreq,"[{\"error\":\"internal error loading domain\"}]",43);

                        return;

                    }
@@ -330,14 +337,13 @@ namespace authdb { 
                            rep.setState(HTTP500);

                            rep.setContentType("application/json");

                            rep.send(curreq,"[{\"error\":\"internal error\"}]",28);

                            rep.send(curreq,"internal error",14);

                        }

                    }else{

                        g_Log.access(clientAddr,method,curreq.getRequestURL(),404);

                        libhttppp::HttpResponse rep;

                        rep.setState(HTTP404);

                        rep.setContentType("text/html");

                        rep.send(curreq,"uuid not found!",12);

                        rep.setContentType("application/json");

                        rep.send(curreq,"[{\"error\":\"uuid not found\"}]",27);

                    }

                }else if(curreq.getRequestURL().compare(0,10,"/getavatar",10)==0){

                    try{