TODO.md

@@ -19,7 +19,6 @@
 * ✅ Streaming responses in slow operations like scaling down
   or building
 * Make more things configurable / remove hardcoded stuff
-  * admin/admin auth
 * CD for binaries and images for at least arm64/x86
 * Multi-container docker logs [faaso logs -f FUNKO]
 * ✅ Direct error and above to stderr, others to stdout,

config/Caddyfile

@@ -5,11 +5,8 @@
 }
 
 http://*:8888 {
-	forward_auth /admin/* http://127.0.0.1:3000 {
-		uri http://127.0.0.1:3000
-		copy_headers {
-			Authorization
-		}
+	basicauth /admin/* {
+		admin {$FAASO_PASSWORD}
 	}
 
   handle_path /admin/terminal/* {

shard.lock

@@ -44,10 +44,6 @@ shards:
     git: https://github.com/kemalcr/kemal.git
     version: 1.5.0
 
-  kemal-basic-auth:
-    git: https://github.com/kemalcr/kemal-basic-auth.git
-    version: 1.0.0
-
   radix:
     git: https://github.com/luislavena/radix.git
     version: 0.4.1

shard.yml

@@ -28,8 +28,6 @@ dependencies:
     branch: add_exposed_ports
   kemal:
     github: kemalcr/kemal
-  kemal-basic-auth:
-    github: kemalcr/kemal-basic-auth
   rucksack:
     github: busyloop/rucksack
   inotify:

src/daemon/main.cr

@@ -5,12 +5,9 @@ require "./terminal.cr"
 require "compress/gzip"
 require "crystar"
 require "docr"
-require "kemal-basic-auth"
 require "kemal"
 require "uuid"
 
-basic_auth "admin", "admin"
-
 macro version
   "{{ `grep version shard.yml | cut -d: -f2` }}".strip()
 end

src/daemon/proxy.cr

@@ -36,11 +36,8 @@ module Proxy
 }
 
 http://*:8888 {
-	forward_auth /admin/* http://127.0.0.1:3000 {
-		uri http://127.0.0.1:3000
-		copy_headers {
-			Authorization
-		}
+	basicauth /admin/* {
+		admin {$FAASO_PASSWORD}
 	}
 
   handle_path /admin/terminal/* {
@@ -49,6 +46,8 @@ http://*:8888 {
   handle_path /admin/* {
     reverse_proxy /* http://127.0.0.1:3000
   }
+
+
 CONFIG
 
     funkos = Funko::Funko.from_docker