From e18279ba022e428344ad5cd33a1143b61ee26ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Mon, 21 Sep 2015 12:25:03 +0200
Subject: [PATCH] add 120 icon and allow requests without useragend (warning
 only)

---
 icons.qrc                  |   1 +
 icons/guh-logo-120x120.png | Bin 0 -> 4106 bytes
 server/httprequest.cpp     |   5 ++---
 server/webserver.cpp       |  28 ++++++++++++++++++----------
 4 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 icons/guh-logo-120x120.png

diff --git a/icons.qrc b/icons.qrc
index 9de097c3..c0f349f4 100644
--- a/icons.qrc
+++ b/icons.qrc
@@ -7,6 +7,7 @@
         <file>icons/guh-logo-32x32.png</file>
         <file>icons/guh-logo-48x48.png</file>
         <file>icons/guh-logo-64x64.png</file>
+        <file>icons/guh-logo-120x120.png</file>
         <file>icons/guh-logo-128x128.png</file>
         <file>icons/guh-logo-256x256.png</file>
         <file>icons/guh-logo-512x512.png</file>
diff --git a/icons/guh-logo-120x120.png b/icons/guh-logo-120x120.png
new file mode 100644
index 0000000000000000000000000000000000000000..52eadf98446ac901c69f965b300edd4a1bd5ac86
GIT binary patch
literal 4106
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

literal 0
HcmV?d00001

diff --git a/server/httprequest.cpp b/server/httprequest.cpp
index 301022e8..662cdacc 100644
--- a/server/httprequest.cpp
+++ b/server/httprequest.cpp
@@ -215,10 +215,9 @@ void HttpRequest::validate()
     }
 
     // check User-Agent
-    if (!m_rawHeaderList.contains("User-Agent")) {
+    if (!m_rawHeaderList.contains("User-Agent"))
         qWarning() << "User-Agent header is missing";
-        return;
-    }
+
 
     // verify content length with actual payload
     if (m_rawHeaderList.contains("Content-Length")) {
diff --git a/server/webserver.cpp b/server/webserver.cpp
index 4268dc92..e63014fd 100644
--- a/server/webserver.cpp
+++ b/server/webserver.cpp
@@ -341,7 +341,7 @@ void WebServer::readClient()
 
     // check if the request is valid
     if (!request.isValid()) {
-        qCWarning(dcWebServer) << "Got invalid request.";
+        qCWarning(dcWebServer) << "Got invalid request:" << request.url().path();
         HttpReply *reply = RestResource::createErrorReply(HttpReply::BadRequest);
         reply->setClientId(clientId);
         sendHttpReply(reply);
@@ -596,7 +596,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     writer.writeTextElement("mimetype", "image/png");
     writer.writeTextElement("width", "8");
     writer.writeTextElement("height", "8");
-    writer.writeTextElement("depth", "24");
+    writer.writeTextElement("depth", "8");
     writer.writeTextElement("url", "/icons/guh-logo-8x8.png");
     writer.writeEndElement(); // icon
 
@@ -604,7 +604,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     writer.writeTextElement("mimetype", "image/png");
     writer.writeTextElement("width", "16");
     writer.writeTextElement("height", "16");
-    writer.writeTextElement("depth", "24");
+    writer.writeTextElement("depth", "8");
     writer.writeTextElement("url", "/icons/guh-logo-16x16.png");
     writer.writeEndElement(); // icon
 
@@ -612,7 +612,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     writer.writeTextElement("mimetype", "image/png");
     writer.writeTextElement("width", "22");
     writer.writeTextElement("height", "22");
-    writer.writeTextElement("depth", "24");
+    writer.writeTextElement("depth", "8");
     writer.writeTextElement("url", "/icons/guh-logo-22x22.png");
     writer.writeEndElement(); // icon
 
@@ -620,7 +620,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     writer.writeTextElement("mimetype", "image/png");
     writer.writeTextElement("width", "32");
     writer.writeTextElement("height", "32");
-    writer.writeTextElement("depth", "24");
+    writer.writeTextElement("depth", "8");
     writer.writeTextElement("url", "/icons/guh-logo-32x32.png");
     writer.writeEndElement(); // icon
 
@@ -628,7 +628,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     writer.writeTextElement("mimetype", "image/png");
     writer.writeTextElement("width", "48");
     writer.writeTextElement("height", "48");
-    writer.writeTextElement("depth", "24");
+    writer.writeTextElement("depth", "8");
     writer.writeTextElement("url", "/icons/guh-logo-48x48.png");
     writer.writeEndElement(); // icon
 
@@ -636,15 +636,23 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     writer.writeTextElement("mimetype", "image/png");
     writer.writeTextElement("width", "64");
     writer.writeTextElement("height", "64");
-    writer.writeTextElement("depth", "24");
+    writer.writeTextElement("depth", "8");
     writer.writeTextElement("url", "/icons/guh-logo-64x64.png");
     writer.writeEndElement(); // icon
 
+    writer.writeStartElement("icon");
+    writer.writeTextElement("mimetype", "image/png");
+    writer.writeTextElement("width", "120");
+    writer.writeTextElement("height", "120");
+    writer.writeTextElement("depth", "8");
+    writer.writeTextElement("url", "/icons/guh-logo-120x120.png");
+    writer.writeEndElement(); // icon
+
     writer.writeStartElement("icon");
     writer.writeTextElement("mimetype", "image/png");
     writer.writeTextElement("width", "128");
     writer.writeTextElement("height", "128");
-    writer.writeTextElement("depth", "24");
+    writer.writeTextElement("depth", "8");
     writer.writeTextElement("url", "/icons/guh-logo-128x128.png");
     writer.writeEndElement(); // icon
 
@@ -652,7 +660,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     writer.writeTextElement("mimetype", "image/png");
     writer.writeTextElement("width", "256");
     writer.writeTextElement("height", "256");
-    writer.writeTextElement("depth", "24");
+    writer.writeTextElement("depth", "8");
     writer.writeTextElement("url", "/icons/guh-logo-256x256.png");
     writer.writeEndElement(); // icon
 
@@ -660,7 +668,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     writer.writeTextElement("mimetype", "image/png");
     writer.writeTextElement("width", "512");
     writer.writeTextElement("height", "512");
-    writer.writeTextElement("depth", "24");
+    writer.writeTextElement("depth", "8");
     writer.writeTextElement("url", "/icons/guh-logo-512x512.png");
     writer.writeEndElement(); // icon