start implementing an extremely simple webserver for testing APT

4 files changed, 254 insertions, 1 deletions

diff --git a/test/integration/framework b/test/integration/framework
index 2d6ada117..a514bef20 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -688,7 +688,12 @@ signreleasefiles() {
 }
 
 changetowebserver() {
-	if which weborf > /dev/null; then
+	if test -x ${BUILDDIRECTORY}/aptwebserver; then
+		cd aptarchive
+		LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver 2> /dev/null > /dev/null &
+		addtrap "kill $!;"
+		cd - > /dev/null
+	elif which weborf > /dev/null; then
 		weborf -xb aptarchive/ 2>&1 > /dev/null &
 		addtrap "kill $!;"
 	elif which gatling > /dev/null; then
diff --git a/test/integration/skip-aptwebserver b/test/integration/skip-aptwebserver
new file mode 100755
index 000000000..0622941ce
--- /dev/null
+++ b/test/integration/skip-aptwebserver
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
+
+setupaptarchive
+changetowebserver
+
+rm -rf rootdir/var/lib/apt/lists
+aptget update -qq
+testequal 'Hit http://localhost stable InRelease
+Hit http://localhost stable/main Sources
+Hit http://localhost stable/main amd64 Packages
+Hit http://localhost stable/main Translation-en
+Reading package lists...' aptget update
+
+mv rootdir/var/lib/apt/lists/localhost* rootdir/var/lib/apt/lists/partial
+aptget update
+
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
new file mode 100644
index 000000000..7a3624b6e
--- /dev/null
+++ b/test/interactive-helper/aptwebserver.cc
@@ -0,0 +1,216 @@
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/cmndline.h>
+
+#include <vector>
+#include <string>
+#include <list>
+#include <sstream>
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#include <errno.h>
+#include <time.h>
+#include <stdlib.h>
+
+char const * const httpcodeToStr(int httpcode) { /*{{{*/
+   switch (httpcode) {
+      // Informational 1xx
+      case 100: return "100 Continue";
+      case 101: return "101 Switching Protocols";
+      // Successful 2xx
+      case 200: return "200 OK";
+      case 201: return "201 Created";
+      case 202: return "202 Accepted";
+      case 203: return "203 Non-Authoritative Information";
+      case 204: return "204 No Content";
+      case 205: return "205 Reset Content";
+      case 206: return "206 Partial Conent";
+      // Redirections 3xx
+      case 300: return "300 Multiple Choices";
+      case 301: return "301 Moved Permanently";
+      case 302: return "302 Found";
+      case 303: return "303 See Other";
+      case 304: return "304 Not Modified";
+      case 305: return "304 Use Proxy";
+      case 307: return "307 Temporary Redirect";
+      // Client errors 4xx
+      case 400: return "400 Bad Request";
+      case 401: return "401 Unauthorized";
+      case 402: return "402 Payment Required";
+      case 403: return "403 Forbidden";
+      case 404: return "404 Not Found";
+      case 405: return "405 Method Not Allowed";
+      case 406: return "406 Not Acceptable";
+      case 407: return "Proxy Authentication Required";
+      case 408: return "Request Time-out";
+      case 409: return "Conflict";
+      case 410: return "Gone";
+      case 411: return "Length Required";
+      case 412: return "Precondition Failed";
+      case 413: return "Request Entity Too Large";
+      case 414: return "Request-URI Too Large";
+      case 415: return "Unsupported Media Type";
+      case 416: return "Requested range not satisfiable";
+      case 417: return "Expectation Failed";
+      // Server error 5xx
+      case 500: return "Internal Server Error";
+      case 501: return "Not Implemented";
+      case 502: return "Bad Gateway";
+      case 503: return "Service Unavailable";
+      case 504: return "Gateway Time-out";
+      case 505: return "HTTP Version not supported";
+   }
+   return NULL;
+} /*}}}*/
+void addFileHeaders(std::list<std::string> &headers, FileFd &data) { /*{{{*/
+   std::ostringstream contentlength;
+   contentlength << "Content-Length: " << data.FileSize();
+   headers.push_back(contentlength.str());
+
+   std::string lastmodified("Last-Modified: ");
+   lastmodified.append(TimeRFC1123(data.ModificationTime()));
+   headers.push_back(lastmodified);
+} /*}}}*/
+bool sendHead(int client, int httpcode, std::list<std::string> &headers) { /*{{{*/
+   string response("HTTP/1.1 ");
+   response.append(httpcodeToStr(httpcode));
+   headers.push_front(response);
+
+   headers.push_back("Server: APT webserver");
+
+   std::string date("Date: ");
+   date.append(TimeRFC1123(time(NULL)));
+   headers.push_back(date);
+
+   std::clog << ">>> RESPONSE >>>" << std::endl;
+   bool Success = true;
+   for (std::list<std::string>::const_iterator h = headers.begin();
+	Success == true && h != headers.end(); ++h) {
+      Success &= FileFd::Write(client, h->c_str(), h->size());
+      Success &= FileFd::Write(client, "\r\n", 2);
+      std::clog << *h << std::endl;
+   }
+   Success &= FileFd::Write(client, "\r\n", 2);
+   std::clog << "<<<<<<<<<<<<<<<<" << std::endl;
+   return Success;
+} /*}}}*/
+bool sendFile(int client, FileFd &data) { /*{{{*/
+   bool Success = true;
+   char buffer[500];
+   unsigned long long actual = 0;
+   while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true) {
+      if (actual == 0)
+	 break;
+      Success &= FileFd::Write(client, buffer, actual);
+   }
+   Success &= FileFd::Write(client, "\r\n", 2);
+   return Success;
+} /*}}}*/
+bool sendData(int client, std::string &data) { /*{{{*/
+   bool Success = true;
+   Success &= FileFd::Write(client, data.c_str(), data.size());
+   Success &= FileFd::Write(client, "\r\n", 2);
+   return Success;
+} /*}}}*/
+void sendError(int client, int httpcode, string request, bool content) { /*{{{*/
+   std::list<std::string> headers;
+   sendHead(client, httpcode, headers);
+   if (content == false)
+      return;
+   string response("<html><head><title>");
+   response.append(httpcodeToStr(httpcode)).append("</title></head>");
+   response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1");
+   response.append("This error is a result of the request: <pre>");
+   response.append(request).append("</pre></body></html>");
+   sendData(client, response);
+} /*}}}*/
+
+int main(int argc, const char *argv[])
+{
+   // create socket, bind and listen to it {{{
+   int sock = socket(AF_INET6, SOCK_STREAM, 0);
+   if(sock < 0 ) {
+      _error->Errno("aptwerbserver", "Couldn't create socket");
+      _error->DumpErrors(std::cerr);
+      return 1;
+   }
+
+   // ensure that we accept all connections: v4 or v6
+   int const iponly = 0;
+   setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &iponly, sizeof(iponly));
+   // to not linger to an address
+   int const enable = 1;
+   setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
+
+   struct sockaddr_in6 locAddr;
+   memset(&locAddr, 0, sizeof(locAddr));
+   locAddr.sin6_family = AF_INET6;
+   locAddr.sin6_port = htons(8080);
+   locAddr.sin6_addr = in6addr_any;
+
+   if (bind(sock, (struct sockaddr*) &locAddr, sizeof(locAddr)) < 0) {
+      _error->Errno("aptwerbserver", "Couldn't bind");
+      _error->DumpErrors(std::cerr);
+      return 2;
+   }
+
+   listen(sock, 1);
+   /*}}}*/
+
+   std::vector<std::string> messages;
+   int client;
+   while ((client = accept(sock, NULL, NULL)) != -1) {
+      std::clog << "ACCEPT client " << client << " on socket " << sock << std::endl;
+
+      while (ReadMessages(client, messages)) {
+	 for (std::vector<std::string>::const_iterator m = messages.begin();
+	      m != messages.end(); ++m) {
+	    std::clog << ">>> REQUEST >>>>" << std::endl << *m << std::endl << "<<<<<<<<<<<<<<<<" << std::endl;
+	    std::list<std::string> headers;
+	    bool sendContent = true;
+	    if (strncmp(m->c_str(), "HEAD ", 5) == 0)
+	       sendContent = false;
+	    if (strncmp(m->c_str(), "GET ", 4) != 0)
+	       sendError(client, 501, *m, true);
+
+	    std::string host = LookupTag(*m, "Host", "");
+	    if (host.empty() == true) {
+	       // RFC 2616 §14.23 Host
+	       sendError(client, 400, *m, sendContent);
+	       continue;
+	    }
+
+	    size_t const filestart = m->find(' ', 5);
+	    string filename = m->substr(5, filestart - 5);
+
+	    if (RealFileExists(filename) == false)
+	       sendError(client, 404, *m, sendContent);
+	    else {
+	       FileFd data(filename, FileFd::ReadOnly);
+	       std::string condition = LookupTag(*m, "If-Modified-Since", "");
+	       if (condition.empty() == false) {
+		  time_t cache;
+		  if (RFC1123StrToTime(condition.c_str(), cache) == true && cache >= data.ModificationTime()) {
+		     sendError(client, 304, *m, false);
+		     continue;
+		  }
+	       }
+	       addFileHeaders(headers, data);
+	       sendHead(client, 200, headers);
+	       if (sendContent == true)
+		  sendFile(client, data);
+	    }
+	 }
+	 _error->DumpErrors(std::cerr);
+	 messages.clear();
+      }
+
+      std::clog << "CLOSE client " << client << " on socket " << sock << std::endl;
+      close(client);
+   }
+   return 0;
+}
diff --git a/test/interactive-helper/makefile b/test/interactive-helper/makefile
index 10d1e44ec..fee94cd77 100644
--- a/test/interactive-helper/makefile
+++ b/test/interactive-helper/makefile
@@ -37,3 +37,10 @@ include $(PROGRAM_H)
 #SLIBS = -lapt-pkg -lrpm
 #SOURCE = rpmver.cc
 #include $(PROGRAM_H)
+
+# very simple webserver for APT testing
+PROGRAM=aptwebserver
+SLIBS = -lapt-pkg
+LIB_MAKES = apt-pkg/makefile
+SOURCE = aptwebserver.cc
+include $(PROGRAM_H)