ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-18 20:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
029adc177f
serval-dna/rhizome_http.c

103 lines
3.7 KiB
C
Raw Normal View History

Added missing GPL license statements.
2011-12-21 09:55:05 +00:00
/*
Forbid HTTP /restful/rhizome/bundlelist.json except from loopback
2013-11-12 01:10:47 +00:00
Serval DNA Rhizome HTTP external interface
Create rhizome_restful.c, meshms_restful.c Move code from rhizome_http.c into rhizome_restful.c and meshms_restful.c
2014-02-03 12:35:15 +00:00
Copyright (C) 2013,2014 Serval Project Inc.
Added missing GPL license statements.
2011-12-21 09:55:05 +00:00
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
Create rhizome_restful.c, meshms_restful.c Move code from rhizome_http.c into rhizome_restful.c and meshms_restful.c
2014-02-03 12:35:15 +00:00
#include "serval.h"
Fix conflict on UNUSED() macro from OpenJDK 7 The OpenJDK 7 recently introduced the UNUSED() macro in their jni_md.h header file, which is included from <jni.h>. This causes a compile-error if "constants.h", which defines our own UNUSED() macro, is included as well as <jni.h>. The OpenJDK UNUSED() macro is unsuitable for our own use, because it prefixes the unused identifier with "UNUSED_" whereas we depend on the parameter name remaining unchanged. I have reported this as a Request for Enhancement with Oracle Java, asking them to remove the UNUSED() macro, since it is not used by any JNI or Java extension header files. Review ID: JI-9013689. In the meantime, constants.h now undefines UNUSED before defining it, so including <jni.h> before "constants.h" will avoid a compile error.
2014-07-23 01:03:41 +00:00
#include "conf.h"
Create rhizome_restful.c, meshms_restful.c Move code from rhizome_http.c into rhizome_restful.c and meshms_restful.c
2014-02-03 12:35:15 +00:00
#include "httpd.h"
Move str functions to c file to enable reuse
2012-08-06 02:55:45 +00:00
#include "str.h"
Implement HTTP POST /restful/rhizome/insert Change HTTP request buffer pointers from (const char*) to (char*) because some Rhizome operations can modify received data in-place, eg, when decrypting it.
2013-12-30 07:39:56 +00:00
#include "strbuf.h"
Refactor and simplify http server - Define a function per page that is responsible for parsing requests - Define a "generator" callback function for filling the buffer for a response - Remove features that have never been used - Remove functions that are no longer used
2013-09-24 00:20:45 +00:00
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
DEFINE_FEATURE(http_rhizome);
Use section linking to define httpd pages
2015-08-24 03:18:00 +00:00
DECLARE_HANDLER("/rhizome/status", rhizome_status_page);
DECLARE_HANDLER("/rhizome/file/", rhizome_file_page);
DECLARE_HANDLER("/rhizome/manifestbyprefix/", manifest_by_prefix_page);
static int rhizome_file_page(httpd_request *r, const char *remainder)
Refactor and simplify http server - Define a function per page that is responsible for parsing requests - Define a "generator" callback function for filling the buffer for a response - Remove features that have never been used - Remove functions that are no longer used
2013-09-24 00:20:45 +00:00
{
/* Stream the specified payload */
if (!is_rhizome_http_enabled())
Refactor HTTP server result code handling Rhizome dispatch functions now simply return the HTTP result code, or 1 if they have initiated the response themselves.
2013-12-16 01:51:45 +00:00
return 403;
if (r->http.verb != HTTP_VERB_GET)
return 405;
Rewrite HTTP server
2013-10-16 07:55:58 +00:00
if (r->http.request_header.content_range_count > 1) {
// To support byte range sets, eg, Range: bytes=0-100,200-300,400- we would have
// to reply with a multipart/byteranges MIME content.
http_request_simple_response(&r->http, 501, "Not Implemented: Byte range sets");
Refactor HTTP server result code handling Rhizome dispatch functions now simply return the HTTP result code, or 1 if they have initiated the response themselves.
2013-12-16 01:51:45 +00:00
return 1;
Rewrite HTTP server
2013-10-16 07:55:58 +00:00
}
Issue #11: Use rhizome_filehash_t everywhere
2013-10-10 07:53:06 +00:00
rhizome_filehash_t filehash;
if (str_to_rhizome_filehash_t(&filehash, remainder) == -1)
Refactor and simplify http server - Define a function per page that is responsible for parsing requests - Define a "generator" callback function for filling the buffer for a response - Remove features that have never been used - Remove functions that are no longer used
2013-09-24 00:20:45 +00:00
return 1;
Implement HTTP GET /restful/rhizome/<BID>/decrypted.bin
2013-12-16 02:02:16 +00:00
int ret = rhizome_response_content_init_filehash(r, &filehash);
Implement HTTP GET /restful/rhizome/<BID>/raw.bin
2013-12-13 06:06:37 +00:00
if (ret)
Refactor HTTP server result code handling Rhizome dispatch functions now simply return the HTTP result code, or 1 if they have initiated the response themselves.
2013-12-16 01:51:45 +00:00
return ret;
Add proper server support for http/1.1 Expect header
2017-05-17 02:37:50 +00:00
// backwards compatibility, rhizome_fetch used to allow HTTP/1.0 responses only
r->http.response.header.minor_version=0;
Improve HTTP Content-Type handling Undo a change from late 2015 that allowed the format=text+binarysig parameter of the rhizome/manifest MIME content-type to be optional -- it is easy to provide that parameter via libcurl, and the lbard code has just been updated to provide it. Make Content-Type handling consistent throughout the Serval DNA code by using 'struct mime_content_type' to represent both parsed (request) and sent (response) Content-Type fields, replacing ad-hoc in-line string literals. Fix some TODOs by adding the "serval/sid", "rhizome/bid" and "rhizome/bundlesecret" MIME types, which remain optional for the time being to preserve REST API compatibility with clients that do not set the Content-Type of their 'bundle-author', 'bundle-id' and 'bundle-secret' parameters.
2017-10-19 23:25:21 +00:00
http_request_response_generated(&r->http, 200, &CONTENT_TYPE_BLOB, rhizome_payload_content);
Refactor HTTP server result code handling Rhizome dispatch functions now simply return the HTTP result code, or 1 if they have initiated the response themselves.
2013-12-16 01:51:45 +00:00
return 1;
Refactor and simplify http server - Define a function per page that is responsible for parsing requests - Define a "generator" callback function for filling the buffer for a response - Remove features that have never been used - Remove functions that are no longer used
2013-09-24 00:20:45 +00:00
}
Use section linking to define httpd pages
2015-08-24 03:18:00 +00:00
static int manifest_by_prefix_page(httpd_request *r, const char *remainder)
Refactor and simplify http server - Define a function per page that is responsible for parsing requests - Define a "generator" callback function for filling the buffer for a response - Remove features that have never been used - Remove functions that are no longer used
2013-09-24 00:20:45 +00:00
{
if (!is_rhizome_http_enabled())
Refactor HTTP server result code handling Rhizome dispatch functions now simply return the HTTP result code, or 1 if they have initiated the response themselves.
2013-12-16 01:51:45 +00:00
return 403;
if (r->http.verb != HTTP_VERB_GET)
return 405;
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
rhizome_bid_t prefix;
const char *endp = NULL;
unsigned prefix_len = strn_fromhex(prefix.binary, sizeof prefix.binary, remainder, &endp);
if (endp == NULL || *endp != '\0' || prefix_len < 1)
Refactor HTTP server result code handling Rhizome dispatch functions now simply return the HTTP result code, or 1 if they have initiated the response themselves.
2013-12-16 01:51:45 +00:00
return 404; // not found
Implement HTTP POST /restful/rhizome/insert Change HTTP request buffer pointers from (const char*) to (char*) because some Rhizome operations can modify received data in-place, eg, when decrypting it.
2013-12-30 07:39:56 +00:00
if ((r->manifest = rhizome_new_manifest()) == NULL)
return 500;
Ensure sql lock failures are returned.
2014-09-08 07:44:55 +00:00
switch(rhizome_retrieve_manifest_by_prefix(prefix.binary, prefix_len, r->manifest)){
case RHIZOME_BUNDLE_STATUS_SAME:
Add proper server support for http/1.1 Expect header
2017-05-17 02:37:50 +00:00
// backwards compatibility, rhizome_fetch used to allow HTTP/1.0 responses only
r->http.response.header.minor_version=0;
Improve HTTP Content-Type handling Undo a change from late 2015 that allowed the format=text+binarysig parameter of the rhizome/manifest MIME content-type to be optional -- it is easy to provide that parameter via libcurl, and the lbard code has just been updated to provide it. Make Content-Type handling consistent throughout the Serval DNA code by using 'struct mime_content_type' to represent both parsed (request) and sent (response) Content-Type fields, replacing ad-hoc in-line string literals. Fix some TODOs by adding the "serval/sid", "rhizome/bid" and "rhizome/bundlesecret" MIME types, which remain optional for the time being to preserve REST API compatibility with clients that do not set the Content-Type of their 'bundle-author', 'bundle-id' and 'bundle-secret' parameters.
2017-10-19 23:25:21 +00:00
http_request_response_static(&r->http, 200, &CONTENT_TYPE_BLOB, (const char *)r->manifest->manifestdata, r->manifest->manifest_all_bytes);
Ensure sql lock failures are returned.
2014-09-08 07:44:55 +00:00
return 1;
case RHIZOME_BUNDLE_STATUS_NEW:
return 404;
default:
return 500;
Refactor HTTP server result code handling Rhizome dispatch functions now simply return the HTTP result code, or 1 if they have initiated the response themselves.
2013-12-16 01:51:45 +00:00
}
Refactor and simplify http server - Define a function per page that is responsible for parsing requests - Define a "generator" callback function for filling the buffer for a response - Remove features that have never been used - Remove functions that are no longer used
2013-09-24 00:20:45 +00:00
}
Use section linking to define httpd pages
2015-08-24 03:18:00 +00:00
static int rhizome_status_page(httpd_request *r, const char *remainder)
Refactor and simplify http server - Define a function per page that is responsible for parsing requests - Define a "generator" callback function for filling the buffer for a response - Remove features that have never been used - Remove functions that are no longer used
2013-09-24 00:20:45 +00:00
{
Refactor to rename "Rhizome HTTP server" to "HTTPD server" Move HTTPD start/stop/dispatch logic from rhizome_httpd.c into new httpd.c Rename config.debug.httpd -> config.debug.http_server Rename config.debug.rhizome_httpd -> config.debug.httpd Rename config.debug.rhizome_nohttptx -> config.debug.nohttptx
2014-01-31 07:32:41 +00:00
if (!is_rhizome_http_enabled())
return 403;
Refactor and simplify http server - Define a function per page that is responsible for parsing requests - Define a "generator" callback function for filling the buffer for a response - Remove features that have never been used - Remove functions that are no longer used
2013-09-24 00:20:45 +00:00
if (*remainder)
Refactor HTTP server result code handling Rhizome dispatch functions now simply return the HTTP result code, or 1 if they have initiated the response themselves.
2013-12-16 01:51:45 +00:00
return 404;
if (r->http.verb != HTTP_VERB_GET)
return 405;
Refactor to rename "Rhizome HTTP server" to "HTTPD server" Move HTTPD start/stop/dispatch logic from rhizome_httpd.c into new httpd.c Rename config.debug.httpd -> config.debug.http_server Rename config.debug.rhizome_httpd -> config.debug.httpd Rename config.debug.rhizome_nohttptx -> config.debug.nohttptx
2014-01-31 07:32:41 +00:00
char buf[32*1024];
Add strbuf_local_buf() macro
2015-10-13 08:12:22 +00:00
strbuf b = strbuf_local_buf(buf);
Refactor to rename "Rhizome HTTP server" to "HTTPD server" Move HTTPD start/stop/dispatch logic from rhizome_httpd.c into new httpd.c Rename config.debug.httpd -> config.debug.http_server Rename config.debug.rhizome_httpd -> config.debug.httpd Rename config.debug.rhizome_nohttptx -> config.debug.nohttptx
2014-01-31 07:32:41 +00:00
strbuf_puts(b, "<html><head><meta http-equiv=\"refresh\" content=\"5\" ></head><body>");
Rename variable to current_httpd_request_count
2015-06-22 08:41:00 +00:00
strbuf_sprintf(b, "%d HTTP requests<br>", current_httpd_request_count);
Refactor to rename "Rhizome HTTP server" to "HTTPD server" Move HTTPD start/stop/dispatch logic from rhizome_httpd.c into new httpd.c Rename config.debug.httpd -> config.debug.http_server Rename config.debug.rhizome_httpd -> config.debug.httpd Rename config.debug.rhizome_nohttptx -> config.debug.nohttptx
2014-01-31 07:32:41 +00:00
strbuf_sprintf(b, "%d Bundles transferring via MDP<br>", rhizome_cache_count());
rhizome_fetch_status_html(b);
Refactor and simplify http server - Define a function per page that is responsible for parsing requests - Define a "generator" callback function for filling the buffer for a response - Remove features that have never been used - Remove functions that are no longer used
2013-09-24 00:20:45 +00:00
strbuf_puts(b, "</body></html>");
Refactor to rename "Rhizome HTTP server" to "HTTPD server" Move HTTPD start/stop/dispatch logic from rhizome_httpd.c into new httpd.c Rename config.debug.httpd -> config.debug.http_server Rename config.debug.rhizome_httpd -> config.debug.httpd Rename config.debug.rhizome_nohttptx -> config.debug.nohttptx
2014-01-31 07:32:41 +00:00
if (strbuf_overrun(b))
return -1;
Improve HTTP Content-Type handling Undo a change from late 2015 that allowed the format=text+binarysig parameter of the rhizome/manifest MIME content-type to be optional -- it is easy to provide that parameter via libcurl, and the lbard code has just been updated to provide it. Make Content-Type handling consistent throughout the Serval DNA code by using 'struct mime_content_type' to represent both parsed (request) and sent (response) Content-Type fields, replacing ad-hoc in-line string literals. Fix some TODOs by adding the "serval/sid", "rhizome/bid" and "rhizome/bundlesecret" MIME types, which remain optional for the time being to preserve REST API compatibility with clients that do not set the Content-Type of their 'bundle-author', 'bundle-id' and 'bundle-secret' parameters.
2017-10-19 23:25:21 +00:00
http_request_response_static(&r->http, 200, &CONTENT_TYPE_HTML, buf, strbuf_len(b));
Refactor HTTP server result code handling Rhizome dispatch functions now simply return the HTTP result code, or 1 if they have initiated the response themselves.
2013-12-16 01:51:45 +00:00
return 1;
Rhizome web server can now serve a 400 error message, which means that lots of the underlying stuff is now in place.
2011-12-22 17:55:18 +00:00
}
Reference in New Issue Copy Permalink