From 099ddede975d221bf430b3eed22113b8f42d3ec8 Mon Sep 17 00:00:00 2001
From: TheiLLeniumStudios
 <104288623+TheiLLeniumStudios@users.noreply.github.com>
Date: Tue, 11 Apr 2023 04:11:04 +0000
Subject: [PATCH 1/3] feat(logger/loki): Allow users to specify protocol for
 requests

---
 imports/logger/server.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/imports/logger/server.lua b/imports/logger/server.lua
index 5151979..b5c13d8 100644
--- a/imports/logger/server.lua
+++ b/imports/logger/server.lua
@@ -90,7 +90,8 @@ end
 if service == 'loki' then
     local lokiUser = GetConvar('loki:user', '')
     local lokiKey = GetConvar('loki:key', '')
-    local endpoint = ('https://%s:%s@%s/loki/api/v1/push'):format(lokiUser, lokiKey, GetConvar('loki:endpoint', ''))
+    local lokiProtocol = GetConvar('loki:protocol', 'https')
+    local endpoint = ('%s://%s:%s@%s/loki/api/v1/push'):format(lokiProtocol, lokiUser, lokiKey, GetConvar('loki:endpoint', ''))
 
     -- Converts a string of comma seperated kvp string to a table of kvps
     -- example `discord:blahblah,fivem:blahblah,license:blahblah` -> `{discord="blahblah",fivem="blahblah",license="blahblah"}`

From b5515eabdc0b520e261b8ec53efc1dafeb09f327 Mon Sep 17 00:00:00 2001
From: TheiLLeniumStudios
 <104288623+TheiLLeniumStudios@users.noreply.github.com>
Date: Mon, 17 Apr 2023 06:10:04 +0000
Subject: [PATCH 2/3] refactor: Use authorization header instead of URL
 credentials

---
 imports/logger/server.lua | 49 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/imports/logger/server.lua b/imports/logger/server.lua
index b5c13d8..79a94f1 100644
--- a/imports/logger/server.lua
+++ b/imports/logger/server.lua
@@ -3,6 +3,32 @@ local hostname = GetConvar('sv_projectName', 'fxserver')
 local buffer
 local bufferSize = 0
 
+local b = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+
+local function base64encode(data)
+    return ((data:gsub(".", function(x)
+        local r, b = "", x:byte()
+        for i = 8, 1, -1 do
+            r = r .. (b % 2 ^ i - b % 2 ^ (i - 1) > 0 and "1" or "0")
+        end
+        return r;
+    end) .. "0000"):gsub("%d%d%d?%d?%d?%d?", function(x)
+        if (#x < 6) then
+            return ""
+        end
+        local c = 0
+        for i = 1, 6 do
+            c = c + (x:sub(i, i) == "1" and 2 ^ (6 - i) or 0)
+        end
+        return b:sub(c + 1, c + 1)
+    end) .. ({"", "==", "="})[#data % 3 + 1])
+end
+
+local function getAuthorizationHeader(user, password)
+    return "Basic " .. base64encode(user .. ":" .. password)
+end
+
+
 local function badResponse(endpoint, status, response)
     warn(('unable to submit logs to %s (status: %s)\n%s'):format(endpoint, status, json.encode(response, { indent = true })))
 end
@@ -89,9 +115,22 @@ end
 
 if service == 'loki' then
     local lokiUser = GetConvar('loki:user', '')
-    local lokiKey = GetConvar('loki:key', '')
-    local lokiProtocol = GetConvar('loki:protocol', 'https')
-    local endpoint = ('%s://%s:%s@%s/loki/api/v1/push'):format(lokiProtocol, lokiUser, lokiKey, GetConvar('loki:endpoint', ''))
+    local lokiPassword = GetConvar('loki:password', '')
+    local lokiEndpoint = GetConvar('loki:endpoint', '')
+    local startingPattern = '^http[s]?://'
+    local headers = {
+        ['Content-Type'] = 'application/json',
+    }
+
+    if lokiUser ~= '' then
+        headers['Authorization'] = getAuthorizationHeader(lokiUser, lokiPassword)
+    end
+
+    if not lokiEndpoint:find(startingPattern) then
+        lokiEndpoint = 'https://' .. lokiEndpoint
+    end
+
+    local endpoint = ('%s/loki/api/v1/push'):format(lokiEndpoint)
 
     -- Converts a string of comma seperated kvp string to a table of kvps
     -- example `discord:blahblah,fivem:blahblah,license:blahblah` -> `{discord="blahblah",fivem="blahblah",license="blahblah"}`
@@ -127,9 +166,7 @@ if service == 'loki' then
                     if status ~= 204 then
                         badResponse(endpoint, status, ("%s"):format(status, postBody))
                     end
-                end, 'POST', postBody, {
-                    ['Content-Type'] = 'application/json',
-                })
+                end, 'POST', postBody, headers)
 
                 buffer = nil
             end)

From ffff4833c283521fbdb56abbaf9aa3ef7d34e7c6 Mon Sep 17 00:00:00 2001
From: TheiLLeniumStudios
 <104288623+TheiLLeniumStudios@users.noreply.github.com>
Date: Mon, 17 Apr 2023 06:19:03 +0000
Subject: [PATCH 3/3] chore: Remove unnecessary comma

---
 imports/logger/server.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/imports/logger/server.lua b/imports/logger/server.lua
index 79a94f1..8b47cff 100644
--- a/imports/logger/server.lua
+++ b/imports/logger/server.lua
@@ -119,7 +119,7 @@ if service == 'loki' then
     local lokiEndpoint = GetConvar('loki:endpoint', '')
     local startingPattern = '^http[s]?://'
     local headers = {
-        ['Content-Type'] = 'application/json',
+        ['Content-Type'] = 'application/json'
     }
 
     if lokiUser ~= '' then