fly/flightgear
1
0
Fork 0
Code Activity

httpd: some code cleanup for JsonUriHandler.

Browse source 
no functional change
This commit is contained in:
Torsten Dreyer 2014-11-11 08:59:41 +01:00
parent aeb1eedba8
commit 4b4f5c9e9a
2 changed files with 26 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/Network/http/JsonUriHandler.cxx
View file

@ -22,7 +22,6 @@
#include "JsonUriHandler.hxx"
#include "jsonprops.hxx"
#include <Main/fg_props.hxx>
#include <simgear/props/props.hxx>
using std::string;
@ -41,20 +40,6 @@ bool JsonUriHandler::handleRequest( const HTTPRequest & request, HTTPResponse &
}
if( request.Method == "GET" ){
string propertyPath = request.Uri;
// strip the uri prefix of our handler
propertyPath = propertyPath.substr( getUri().size() );
// strip the querystring
size_t pos = propertyPath.find( '?' );
if( pos != string::npos ) {
propertyPath = propertyPath.substr( 0, pos-1 );
}
// skip trailing '/' - not very efficient but shouldn't happen too often
while( false == propertyPath.empty() && propertyPath[ propertyPath.length()-1 ] == '/' )
propertyPath = propertyPath.substr(0,propertyPath.length()-1);
// max recursion depth
int depth = atoi(request.RequestVariables.get("d").c_str());
@ -64,13 +49,11 @@ bool JsonUriHandler::handleRequest( const HTTPRequest & request, HTTPResponse &
bool indent = request.RequestVariables.get("i") == "y";
bool timestamp = request.RequestVariables.get("t") == "y";
SGPropertyNode_ptr node = fgGetNode( string("/") + propertyPath );
SGPropertyNode_ptr node = getRequestedNode(request );
if( false == node.valid() ) {
response.StatusCode = 404;
response.Content = "{}";
SG_LOG(SG_NETWORK,SG_WARN, "Node not found: '" << propertyPath << "'");
return true;
}
response.Content = JSON::toJsonString( indent, node, depth, timestamp ? fgGetDouble("/sim/time/elapsed-sec") : -1.0 );
@ -79,28 +62,14 @@ bool JsonUriHandler::handleRequest( const HTTPRequest & request, HTTPResponse &
}
if( request.Method == "POST" ) {
SG_LOG(SG_NETWORK,SG_INFO, "Setting properties from JSON: " << request.Content );
string propertyPath = request.Uri;
propertyPath = propertyPath.substr( getUri().size() );
// strip the querystring
size_t pos = propertyPath.find( '?' );
if( pos != string::npos ) {
propertyPath = propertyPath.substr( 0, pos-1 );
}
// skip trailing '/' - not very efficient but shouldn't happen too often
while( false == propertyPath.empty() && propertyPath[ propertyPath.length()-1 ] == '/' )
propertyPath = propertyPath.substr(0,propertyPath.length()-1);
SGPropertyNode_ptr node = fgGetNode( string("/") + propertyPath );
SGPropertyNode_ptr node = getRequestedNode(request );
if( false == node.valid() ) {
response.StatusCode = 404;
response.Content = "{}";
SG_LOG(SG_NETWORK,SG_WARN, "Node not found: '" << propertyPath << "'");
return true;
}
SG_LOG(SG_NETWORK,SG_INFO, "JsonUriHandler: setting property from'" << request.Content << "'" );
cJSON * json = cJSON_Parse( request.Content.c_str() );
if( NULL != json ) {
JSON::toProp( json, node );
@ -111,13 +80,32 @@ bool JsonUriHandler::handleRequest( const HTTPRequest & request, HTTPResponse &
return true;
}
response.Header["Allow"] = "OPTIONS, GET";
SG_LOG(SG_NETWORK,SG_INFO, "JsonUriHandler: invalid request method '" << request.Method << "'" );
response.Header["Allow"] = "OPTIONS, GET, POST";
response.StatusCode = 405;
response.Content = "{}";
return true;
}
SGPropertyNode_ptr JsonUriHandler::getRequestedNode(const HTTPRequest & request)
{
SG_LOG(SG_NETWORK,SG_INFO, "JsonUriHandler: request is '" << request.Uri << "'" );
string propertyPath = request.Uri;
propertyPath = propertyPath.substr( getUri().size() );
// skip trailing '/' - not very efficient but shouldn't happen too often
while( false == propertyPath.empty() && propertyPath[ propertyPath.length()-1 ] == '/' )
propertyPath = propertyPath.substr(0,propertyPath.length()-1);
SGPropertyNode_ptr reply = fgGetNode( string("/") + propertyPath );
if( false == reply.valid() ) {
SG_LOG(SG_NETWORK,SG_WARN, "JsonUriHandler: requested node not found: '" << propertyPath << "'");
}
return reply;
}
} // namespace http
} // namespace flightgear

3
src/Network/http/JsonUriHandler.hxx
View file

@ -22,6 +22,7 @@
#define __FG_JSON_URI_HANDLER_HXX
#include "urihandler.hxx"
#include <simgear/props/props.hxx>
namespace flightgear {
namespace http {
@ -30,6 +31,8 @@ class JsonUriHandler : public URIHandler {
public:
JsonUriHandler( const char * uri = "/json/" ) : URIHandler( uri ) {}
virtual bool handleRequest( const HTTPRequest & request, HTTPResponse & response, Connection * connection );
private:
SGPropertyNode_ptr getRequestedNode(const HTTPRequest & request);
};
} // namespace http