Verify HTTP result

IB-4055
open-eid · Aug 24, 2015 · d2e4cc2 · d2e4cc2
1 parent 16d10f9
commit d2e4cc2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/cmake b/cmake
diff --git a/src/crypto/Connect.h b/src/crypto/Connect.h
@@ -35,6 +35,10 @@ class Connect
     struct Result {
         std::string result, content;
         std::map<std::string,std::string> headers;
+        bool isOK() const
+        {
+            return result.find("200") != std::string::npos;
+        }
         bool isRedirect() const
         {
             return result.find("301") != std::string::npos ||

diff --git a/src/crypto/TSL.cpp b/src/crypto/TSL.cpp
@@ -259,6 +259,8 @@ TSL::Result TSL::parse(const string &url, const vector<X509Cert> &certs,
                 Connect::Result r = Connect(url, "GET", timeout).exec({{"Accept-Encoding", "gzip"}}, vector<unsigned char>());
                 if(r.isRedirect())
                     r = Connect(r.headers["Location"], "GET", timeout).exec({{"Accept-Encoding", "gzip"}}, vector<unsigned char>());
+                if(!r.isOK() || r.content.empty())
+                    THROW("HTTP status code is not 200 or content is empty");
                 file << r.content;
                 file.close();
+1 −1		README.txt
+9 −1		modules/FindXSD.cmake
+10 −2		modules/VersionInfo.cmake