Fix default ports

Author: attah

.gitignore

@@ -3,8 +3,7 @@
 *.plist
 tests/test
 tests/*.o
-tests/_test_pdf2printable_16x9_*
-tests/_test_pdf2printable_4x3_*
+tests/_test*
 ppm2pwg
 pwg2ppm
 pdf2printable

lib/curlrequester.cpp

@@ -156,8 +156,30 @@ void CurlIppPosterBase::setCompression(Compression compression)
   deflateInit2(&_zstrm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, level, 7, Z_DEFAULT_STRATEGY);
 }
 
+std::string http_url(std::string str)
+{
+  Url url(str);
+  if(url.getScheme() == "ipp")
+  {
+    url.setScheme("http");
+    if(!url.getPort())
+    {
+      url.setPort(631);
+    }
+  }
+  else if(url.getScheme() == "ipps")
+  {
+    url.setScheme("https");
+    if(!url.getPort())
+    {
+      url.setPort(443);
+    }
+  }
+  return url.toStr();
+}
+
 CurlIppPosterBase::CurlIppPosterBase(std::string addr, bool ignoreSslErrors)
-  : CurlRequester("http"+addr.erase(0,3), ignoreSslErrors)
+  : CurlRequester(http_url(addr), ignoreSslErrors)
 {
   _canWrite.unlock();
   _canRead.lock();

lib/curlrequester.h

@@ -4,6 +4,7 @@
 #include "array.h"
 #include "bytestream.h"
 #include "lthread.h"
+#include "url.h"
 
 #include <curl/curl.h>
 #include <zlib.h>

lib/url.h

@@ -0,0 +1,95 @@
+#ifndef URL_H
+#define URL_H
+
+#include <string>
+#include <regex>
+
+class Url
+{
+public:
+  Url() = delete;
+  Url(std::string str)
+  {
+    match(str);
+  }
+
+  Url& operator=(std::string str)
+  {
+    match(str);
+    return *this;
+  }
+
+  operator std::string()
+  {
+    return toStr();
+  }
+
+  std::string toStr()
+  {
+    std::string maybePort = _port != 0 ? ":" + std::to_string(_port) : "";
+    return _scheme + "://" + _host + maybePort + _path;
+  }
+
+  std::string getScheme()
+  {
+    return _scheme;
+  }
+
+  void setScheme(std::string scheme)
+  {
+    _scheme = scheme;
+  }
+
+  std::string getHost()
+  {
+    return _host;
+  }
+
+  void setHost(std::string host)
+  {
+    _host = host;
+  }
+
+  uint16_t getPort()
+  {
+    return _port;
+  }
+
+  void setPort(uint16_t port)
+  {
+    _port = port;
+  }
+
+  std::string getPath()
+  {
+    return _path;
+  }
+
+  void setPath(std::string path)
+  {
+    _path = path;
+  }
+
+private:
+
+  void match(std::string str)
+  {
+    static const std::regex regex("(([a-z]+)://)([a-z0-9-.]+)(:([0-9]+))?(/.*)?$");
+    std::smatch match;
+    if(!std::regex_match(str, match, regex))
+    {
+      throw(std::logic_error("Invalid url"));
+    }
+    _scheme = match[2];
+    _host = match[3];
+    _port = match[5] == "" ? 0 : stoul(match[5]);
+    _path = match[6];
+  }
+
+  std::string _scheme;
+  std::string _host;
+  uint16_t _port;
+  std::string _path;
+};
+
+#endif // URL_H

tests/test.cpp

@@ -9,6 +9,7 @@
 #include "ippprinter.h"
 #include "ippprintjob.h"
 #include "json11.hpp"
+#include "url.h"
 #include <cstring>
 #include <filesystem>
 using namespace std;
@@ -2437,3 +2438,36 @@ TEST(malicious_dns)
   ASSERT_THROW(get_addr(bts), logic_error);
 
 }
+
+TEST(url)
+{
+  Url url("ipp://myprinter:631/ipp/print");
+  ASSERT(url.getScheme() == "ipp");
+  ASSERT(url.getHost() == "myprinter");
+  ASSERT(url.getPort() == 631);
+  ASSERT(url.getPath() == "/ipp/print");
+  ASSERT(url.toStr() == "ipp://myprinter:631/ipp/print");
+
+  url = "ipp://myprinter/ipp/print";
+  ASSERT(url.getScheme() == "ipp");
+  ASSERT(url.getHost() == "myprinter");
+  ASSERT(url.getPath() == "/ipp/print");
+  ASSERT(url.toStr() == "ipp://myprinter/ipp/print");
+
+  ASSERT_FALSE(url.getPort());
+  url.setPort(631);
+  ASSERT(url.toStr() == "ipp://myprinter:631/ipp/print");
+
+  url = "ipp://myprinter";
+  ASSERT(url.getScheme() == "ipp");
+  ASSERT(url.getHost() == "myprinter");
+  ASSERT(url.getPath() == "");
+  ASSERT(url.toStr() == "ipp://myprinter");
+
+  url.setScheme("ipps");
+  url.setHost("yourprinter");
+  url.setPort(666);
+  url.setPath("/foo/bar");
+  ASSERT(url.toStr() == "ipps://yourprinter:666/foo/bar");
+
+}