removed useless vector for authentication...

there has only been a single auth value so far
arangodb · fceller · Sep 13, 2017 · Sep 6, 2017 · Sep 6, 2017 · Sep 6, 2017
commit 92f398f8c3e24fecf08d20189c60e77da7c8517b
diff --git a/lib/SimpleHttpClient/SimpleHttpClient.cpp b/lib/SimpleHttpClient/SimpleHttpClient.cpp
@@ -73,8 +73,8 @@ SimpleHttpClient::SimpleHttpClient(
     std::unique_ptr<GeneralClientConnection>& connection,
     SimpleHttpClientParams const& params)
     : SimpleHttpClient(connection.get(), params) {
-    _deleteConnectionOnDestruction = true;
-    connection.release();
+  _deleteConnectionOnDestruction = true;
+  connection.release();
 }
 
 SimpleHttpClient::~SimpleHttpClient() {
@@ -530,28 +530,10 @@ void SimpleHttpClient::setRequest(
   }
 
   // do basic authorization
-  if (!_params._pathToBasicAuth.empty()) {
-    std::string foundPrefix;
-    std::string foundValue;
-    auto i = _params._pathToBasicAuth.begin();
-
-    for (; i != _params._pathToBasicAuth.end(); ++i) {
-      std::string& f = i->first;
-
-      if (l->compare(0, f.size(), f) == 0) {
-        // f is prefix of l
-        if (f.length() > foundPrefix.length()) {
-          foundPrefix = f;
-          foundValue = i->second;
-        }
-      }
-    }
-
-    if (!foundValue.empty()) {
-      _writeBuffer.appendText(TRI_CHAR_LENGTH_PAIR("Authorization: Basic "));
-      _writeBuffer.appendText(foundValue);
-      _writeBuffer.appendText(TRI_CHAR_LENGTH_PAIR("\r\n"));
-    }
+  if (!_params._basicAuth.empty()) {
+    _writeBuffer.appendText(TRI_CHAR_LENGTH_PAIR("Authorization: Basic "));
+    _writeBuffer.appendText(_params._basicAuth);
+    _writeBuffer.appendText(TRI_CHAR_LENGTH_PAIR("\r\n"));
   }
   if (!_params._jwt.empty()) {
     _writeBuffer.appendText(TRI_CHAR_LENGTH_PAIR("Authorization: bearer "));
@@ -677,7 +659,9 @@ void SimpleHttpClient::processHeader() {
       // found content-length header in response
       else if (_result->hasContentLength() && _result->getContentLength() > 0) {
         if (_result->getContentLength() > _params._maxPacketSize) {
-          setErrorMessage("Content-Length > max packet size found", true);
+          std::string errorMessage("ignoring HTTP response with 'Content-Length' bigger than max packet size (");
+          errorMessage += std::to_string(_result->getContentLength()) + " > " + std::to_string(_params._maxPacketSize) + ")";
+          setErrorMessage(errorMessage, true);
 
           // reset connection
           this->close();
@@ -801,7 +785,7 @@ void SimpleHttpClient::processChunkedHeader() {
 
   // empty lines are an error
   if (line[0] == '\r' || line.empty()) {
-    setErrorMessage("found invalid content-length", true);
+    setErrorMessage("found invalid Content-Length", true);
     // reset connection
     this->close();
     _state = DEAD;
@@ -814,7 +798,7 @@ void SimpleHttpClient::processChunkedHeader() {
   try {
     contentLength = static_cast<uint32_t>(std::stol(line, nullptr, 16));
   } catch (...) {
-    setErrorMessage("found invalid content-length", true);
+    setErrorMessage("found invalid Content-Length", true);
     // reset connection
     this->close();
     _state = DEAD;
@@ -824,7 +808,9 @@ void SimpleHttpClient::processChunkedHeader() {
 
   // failed: too many bytes
   if (contentLength > _params._maxPacketSize) {
-    setErrorMessage("Content-Length > max packet size found!", true);
+    std::string errorMessage("ignoring HTTP response with 'Content-Length' bigger than max packet size (");
+    errorMessage += std::to_string(contentLength) + " > " + std::to_string(_params._maxPacketSize) + ")";
+    setErrorMessage(errorMessage, true);
     // reset connection
     this->close();
     _state = DEAD;

diff --git a/lib/SimpleHttpClient/SimpleHttpClient.h b/lib/SimpleHttpClient/SimpleHttpClient.h
@@ -97,13 +97,12 @@ struct SimpleHttpClientParams {
   /// @brief sets username and password
   ////////////////////////////////////////////////////////////////////////////////
 
-  void setUserNamePassword(std::string const& prefix,
+  void setUserNamePassword(char const* prefix,
                            std::string const& username,
                            std::string const& password) {
-    std::string value =
-        arangodb::basics::StringUtils::encodeBase64(username + ":" + password);
-
-    _pathToBasicAuth.push_back(std::make_pair(prefix, value));
+    TRI_ASSERT(prefix != nullptr);
+    TRI_ASSERT(strcmp(prefix, "/") == 0);
+    _basicAuth = arangodb::basics::StringUtils::encodeBase64(username + ":" + password);
   }
 
   //////////////////////////////////////////////////////////////////////////////
@@ -144,7 +143,7 @@ struct SimpleHttpClientParams {
 
   size_t _maxPacketSize = SimpleHttpClientParams::MaxPacketSize;
 
-  std::vector<std::pair<std::string, std::string>> _pathToBasicAuth;
+  std::string _basicAuth;
 
   std::string _jwt = "";