Implemented auth handling

Author: craflin

3rdparty/libnstd

@@ -7,16 +7,6 @@ project(gchsd VERSION 0.2.0)
 set(CDEPLOY_NO_DEBUG_BUILD True)
 set(CDEPLOY_NO_COMPILER True)
 
-find_package(CURL REQUIRED)
-if(NOT TARGET CURL::libcurl)
-    add_library(CURL::libcurl INTERFACE IMPORTED)
-    set_target_properties(CURL::libcurl
-        PROPERTIES 
-            INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
-            INTERFACE_LINK_LIBRARIES "${CURL_LIBRARIES}"
-    )
-endif()
-
 include(CDeploy)
 
 add_subdirectory(3rdparty)
@@ -29,7 +19,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A mirroring Git HTTP server daemon")
 set(CPACK_PACKAGING_INSTALL_PREFIX "/")
 #set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/craflin/gchsd")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.15),libcurl4")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.15)")
 set(CPACK_DEBIAN_PACKAGE_SECTION "net")
 
 include(CPack)

CMakeLists.txt

@@ -7,17 +7,17 @@ A daemon to mirror remote Git repositories and serve them over HTTP, automatical
 
 It was developed to be used in CI environments to improve the performance of Git clone operations.
 
-The project is a C++/CURL clone of jonasmalacofilho's [git-cache-http-server](https://github.com/jonasmalacofilho/git-cache-http-server).
+The project is a C++ clone of jonasmalacofilho's [git-cache-http-server](https://github.com/jonasmalacofilho/git-cache-http-server).
 
 ## Build Instructions
 
 * Clone the repository and initialize submodules.
-* Install a dev package of curl. (e.g. `libcurl4-openssl-dev`)
 * Build the project with `cmake`.
 * You can build a `deb` package using the target `package` in CMake.
 
 ## Server Setup
 
+* Install `git`.
 * Install `gchsd` from the `deb` package.
 * Configure a cache directory (default is `/tmp/gchsd`) and listen port (default is `80`) in `/etc/gchsd.conf`.
 * Start the `gchsd` daemon with `sudo systemctl start gchsd`.

README.md

@@ -0,0 +1,18 @@
+
+#include <nstd/String.hpp>
+#include <nstd/Console.hpp>
+#include <nstd/Process.hpp>
+
+int main(int argc, char* argv[])
+{
+    String arg1;
+    if (argc > 1)
+        arg1.attach(argv[1], String::length(argv[1]));
+    if (arg1.startsWith("Username"))
+        Console::print(Process::getEnvironmentVariable("GCHSD_USERNAME"));
+    else if (arg1.startsWith("Password"))
+        Console::print(Process::getEnvironmentVariable("GCHSD_PASSWORD"));
+    else
+        return 1;
+    return 0;
+}

src/AskPass.cpp

@@ -0,0 +1,60 @@
+
+#include "Authentications.hpp"
+
+#include <nstd/Mutex.hpp>
+#include <nstd/HashMap.hpp>
+#include <nstd/Time.hpp>
+
+namespace {
+    typedef HashMap<String, int64> AuthMap;
+
+    Mutex _mutex;
+    AuthMap _authentications;
+
+    String getKey(const String& repo, const String& auth)
+    {
+        return auth + " " + repo;
+    }
+
+    void _cleanup(int64 now)
+    {
+        while (!_authentications.isEmpty())
+        {
+            if (now - _authentications.front() < 60 * 60 * 1000) // 1 hour
+                break;
+            _authentications.removeFront();
+        }
+    }
+}
+
+void storeAuth(const String& repo, const String& auth)
+{
+    String key = getKey(repo, auth);
+    int64 now = Time::time();
+    {
+        Mutex::Guard guard(_mutex);
+        _cleanup(now);
+        _authentications.remove(key);
+        _authentications.append(key, now);
+    }
+}
+
+void removeAuth(const String& repo, const String& auth)
+{
+    String key = getKey(repo, auth);
+    {
+        Mutex::Guard guard(_mutex);
+        _authentications.remove(key);
+    }
+}
+
+bool checkAuth(const String& repo, const String& auth)
+{
+    String key = getKey(repo, auth);
+    int64 now = Time::time();
+    {
+        Mutex::Guard guard(_mutex);
+        _cleanup(now);
+        return _authentications.contains(key);
+    }
+}

src/Authentications.cpp

@@ -0,0 +1,9 @@
+
+#pragma once
+
+#include <nstd/String.hpp>
+
+void storeAuth(const String& repo, const String& auth);
+void removeAuth(const String& repo, const String& auth);
+bool checkAuth(const String& repo, const String& auth);
+

src/Authentications.hpp

@@ -1,9 +1,11 @@
 
 set(sources
+    Authentications.cpp
+    Authentications.hpp
     Address.hpp
-    HttpRequest.cpp
-    HttpRequest.hpp
     Main.cpp
+    NamedMutex.cpp
+    NamedMutex.hpp
     Settings.cpp
     Settings.hpp
     Worker.cpp
@@ -15,12 +17,28 @@ add_executable(gchsd
 )
 
 target_link_libraries(gchsd PRIVATE
-    libnstd::Socket CURL::libcurl
+    libnstd::Socket
 )
 
 source_group("" FILES ${sources})
-
 set_property(TARGET gchsd PROPERTY FOLDER "src")
 
-install(TARGETS gchsd DESTINATION usr/sbin)
+
+set(sources
+    AskPass.cpp
+)
+
+add_executable(gchsd-askpass
+    ${sources}
+)
+target_link_libraries(gchsd-askpass PRIVATE
+    libnstd::Core
+)
+
+source_group("" FILES ${sources})
+set_property(TARGET gchsd-askpass PROPERTY FOLDER "src")
+
+
+
+install(TARGETS gchsd gchsd-askpass DESTINATION usr/sbin)
 

src/CMakeLists.txt

@@ -0,0 +1,29 @@
+#include "NamedMutex.hpp"
+
+namespace {
+    Mutex _mutex;
+}
+
+NamedMutexGuard::MutexMap NamedMutexGuard::_objects;
+
+NamedMutexGuard::NamedMutexGuard(const String& name)
+{
+    {
+        Mutex::Guard guard(_mutex);
+        _object = _objects.find(name);
+        if (_object == _objects.end())
+            _object = _objects.insert(_objects.end(), name);
+        ++_object->count;
+    }
+    _object->mutex.lock();
+}
+
+NamedMutexGuard::~NamedMutexGuard()
+{
+    _object->mutex.unlock();
+    {
+        Mutex::Guard guard(_mutex);
+        if (--_object->count == 0)
+            _objects.remove(_object);
+    }
+}

src/HttpRequest.cpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <nstd/Mutex.hpp>
+#include <nstd/String.hpp>
+#include <nstd/PoolMap.hpp>
+
+class NamedMutexGuard
+{
+public:
+    NamedMutexGuard(const String& name);
+    ~NamedMutexGuard();
+
+private:
+    struct NamedMutex
+    {
+        Mutex mutex;
+        usize count;
+
+        NamedMutex() : count(0) {}
+    };
+
+    typedef PoolMap<String, NamedMutex> MutexMap;
+
+private:
+    MutexMap::Iterator _object;
+
+private:
+    static MutexMap _objects;
+};

src/HttpRequest.hpp

@@ -5,9 +5,11 @@
 #include <nstd/List.hpp>
 #include <nstd/Log.hpp>
 #include <nstd/Directory.hpp>
+#include <nstd/Process.hpp>
 
 Settings::Settings()
-    : listenAddr{Socket::anyAddress, 80}
+    : askpassPath(File::getDirectoryName(Process::getExecutablePath()) + "/gchsd-askpass")
+    , listenAddr{Socket::anyAddress, 80}
     , cacheDir(Directory::getTempDirectory() + "/gchsd")
 {
     ;

src/NamedMutex.cpp

@@ -7,6 +7,7 @@
 
 struct Settings
 {
+    String askpassPath;
     Address listenAddr;
     String cacheDir;