diff --git a/include/crowsite/site/auth.h b/include/crowsite/site/auth.h
index 5a6ebe8..e6801a0 100644
--- a/include/crowsite/site/auth.h
+++ b/include/crowsite/site/auth.h
@@ -9,7 +9,7 @@
namespace cs {
- void handleLoginPost(cs::parser::Post postData);
+ bool handleLoginPost(cs::parser::Post& postData);
}
diff --git a/src/crowsite/site/auth.cpp b/src/crowsite/site/auth.cpp
index b547432..838b412 100644
--- a/src/crowsite/site/auth.cpp
+++ b/src/crowsite/site/auth.cpp
@@ -2,7 +2,19 @@
// Created by brett on 16/08/23.
//
#include
+#include
+#include "blt/std/logging.h"
namespace cs {
-
+
+ bool handleLoginPost(parser::Post& postData)
+ {
+ // javascript should make sure we don't send post requests without information
+ // this way it can be interactive
+ if (!postData.hasKey("username") || !postData.hasKey("password"))
+ return false;
+ auto auth = jellyfin::authenticateUser(postData["username"], postData["password"]);
+
+ return auth == jellyfin::auth_response::AUTHORIZED;
+ }
}
\ No newline at end of file
diff --git a/src/crowsite/utility.cpp b/src/crowsite/utility.cpp
index 5a700bb..3a23707 100644
--- a/src/crowsite/utility.cpp
+++ b/src/crowsite/utility.cpp
@@ -3,6 +3,7 @@
//
#include
#include
+#include
namespace cs {
@@ -10,10 +11,12 @@ namespace cs {
Post::Post(const std::string& input) {
auto pairs = blt::string::split(input, "&");
for (const auto& pair : pairs) {
- //BLT_TRACE("Pair: %s", pair.c_str());
auto kv = blt::string::split(pair, "=");
- //zBLT_TRACE("[%s] = %s", kv[0].c_str(), kv[1].c_str());
- m_Values[kv[0]] = kv[1];
+ auto key = kv[0];
+ auto value = kv[1];
+ auto stripped_key = curl_easy_unescape(nullptr, key.c_str(), 0, nullptr);
+ auto stripped_value = curl_easy_unescape(nullptr, value.c_str(), 0, nullptr);
+ m_Values[stripped_key] = stripped_value;
}
}
diff --git a/src/main.cpp b/src/main.cpp
index f64d676..311a5dc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -57,7 +57,8 @@ int main(int argc, const char** argv)
cs::jellyfin::setToken(blt::arg_parse::get(args["token"]));
cs::jellyfin::processUserData();
- cs::jellyfin::authenticateUser(blt::arg_parse::get(args["user"]), blt::arg_parse::get(args["pass"]));
+ auto res = cs::jellyfin::authenticateUser(blt::arg_parse::get(args["user"]), blt::arg_parse::get(args["pass"]));
+ BLT_INFO("Has true: %b", res == cs::jellyfin::auth_response::AUTHORIZED);
BLT_INFO("Starting site %s.", SITE_NAME);
crow::mustache::set_global_base(SITE_FILES_PATH);
@@ -76,6 +77,7 @@ int main(int argc, const char** argv)
context["SITE_NAME"] = SITE_NAME;
context["SITE_VERSION"] = SITE_VERSION;
context["BEE_MOVIE"] = beemovie_script;
+ context["SITE_BACKGROUND"] = "/static/images/backgrounds/2023-05-26_23.18.23.png";
BLT_INFO("Starting cache engine");
@@ -128,7 +130,13 @@ int main(int argc, const char** argv)
cs::parser::Post pp(req.body);
crow::response res(303);
- res.set_header("Location", pp.hasKey("referer") ? pp["referer"] : "/");
+
+ // either redirect to clear the form if failed or pass user to index
+ if (cs::handleLoginPost(pp))
+ res.set_header("Location", pp.hasKey("referer") ? pp["referer"] : "/");
+ else
+ res.set_header("Location", "/login.html");
+
return res;
}
);