Add Amazon SimpleDB simulator.

Will be used for safe account locking of Amazon S3 stores. Build now requires Boost::PropertyTree.
boxbackup · Nov 29, 2015 · a4fc33f · a4fc33f
1 parent 6cb2ccd
commit a4fc33f
Show file tree

Hide file tree

Showing 8 changed files with 1,035 additions and 85 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ addons:
       - libwww-perl
       - xsltproc
       - zlib1g-dev
+      - libboost-dev
 
 before_script:
   - ccache -s

diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4
@@ -184,6 +184,10 @@ else
   have_regex_support=no
 fi
 
+# Check for Boost PropertyTree (XML and JSON support for lib/httpserver)
+AC_CHECK_HEADER([boost/property_tree/ptree.hpp],,
+	[AC_MSG_ERROR([[cannot find Boost::PropertyTree, try installing libboost-dev]])])
+
 ### Checks for typedefs, structures, and compiler characteristics.
 
 AC_CHECK_TYPES([u_int8_t, u_int16_t, u_int32_t, u_int64_t])

diff --git a/lib/httpserver/HTTPException.txt b/lib/httpserver/HTTPException.txt
@@ -20,3 +20,6 @@ WrongContentLength			16	There was too much or not enough data in the request con
 ParameterNotFound			17	An expected parameter was not found in the request.
 DuplicateParameter			18	A parameter was unexpectedly duplicated in the request.
 AuthenticationFailed			19	The request could not be authenticated.
+S3SimulatorError			20	An unspecified error occurred in the S3Simulator.
+ConditionalPutConflict			21	Conditional PutAttributes request failed because the current attribute values did not match.
+ConditionalPutNotFound			22	Conditional PutAttributes request failed because the expected attribute values were not found.
diff --git a/lib/httpserver/HTTPResponse.cpp b/lib/httpserver/HTTPResponse.cpp
@@ -114,6 +114,7 @@ const char *HTTPResponse::ResponseCodeToString(int ResponseCode)
 	case Code_Unauthorized: return "401 Unauthorized"; break;
 	case Code_Forbidden: return "403 Forbidden"; break;
 	case Code_NotFound: return "404 Not Found"; break;
+	case Code_Conflict: return "409 Conflict"; break;
 	case Code_InternalServerError: return "500 Internal Server Error"; break;
 	case Code_NotImplemented: return "501 Not Implemented"; break;
 	default:

diff --git a/lib/httpserver/HTTPResponse.h b/lib/httpserver/HTTPResponse.h
@@ -91,6 +91,7 @@ class HTTPResponse : public CollectInBufferStream
 		Code_Unauthorized = 401,
 		Code_Forbidden = 403,
 		Code_NotFound = 404,
+		Code_Conflict = 409,
 		Code_InternalServerError = 500,
 		Code_NotImplemented = 501
 	};
@@ -133,6 +134,16 @@ class HTTPResponse : public CollectInBufferStream
 		mHeaders.SetContentLength(GetSize());
 	}
 
+	// Clear all state for reading again
+	void Reset()
+	{
+		CollectInBufferStream::Reset();
+		mHeaders = HTTPHeaders();
+		mResponseCode = HTTPResponse::Code_NoContent;
+		mResponseIsDynamicContent = true;
+		mpStreamToSendTo = NULL;
+	}
+
 private:
 	int mResponseCode;
 	bool mResponseIsDynamicContent;