diff --git a/README.md b/README.md index 424cc35e..52e20fa0 100644 --- a/README.md +++ b/README.md @@ -87,8 +87,8 @@ sunshine needs access to uinput to create mouse and gamepad events: - When Moonlight request you insert the correct pin on sunshine: - Type in the URL bar of your browser: `https://xxx.xxx.xxx.xxx:47990` where `xxx.xxx.xxx.xxx` is the IP address of your computer - Ignore any warning given by your browser about "insecure website" - - You should see a page containing both a new username and a password, needed to login into the next step - - Press "login" and log in using the credentials given above + - You should compile the next page with a new username and a password, needed to login into the next step + - Press "Save" and log in using the credentials given above - Go to "PIN" in the Header - Type in your PIN and press Enter, you should get a Success Message - Click on one of the Applications listed diff --git a/assets/web/welcome.html b/assets/web/welcome.html index 17b5c0c5..8dd40a83 100644 --- a/assets/web/welcome.html +++ b/assets/web/welcome.html @@ -6,25 +6,64 @@
These Credentials down below are needed to access the rest of the application.
Keep them safe, since you will never see them again!
-
+
- +
- +
- Login -
+
+ + +
+ +
Error: {{error}}
+
Success! This page will reload soon, your browser will ask you for the new credentials
+ \ No newline at end of file diff --git a/sunshine/config.cpp b/sunshine/config.cpp index 2e5c8788..02a5438a 100644 --- a/sunshine/config.cpp +++ b/sunshine/config.cpp @@ -230,8 +230,6 @@ sunshine_t sunshine { SUNSHINE_CONFIG_DIR "/sunshine.conf", // config file {}, // cmd args 47989, - false, // show credentials, - "" }; bool endline(char ch) { diff --git a/sunshine/config.h b/sunshine/config.h index a013c525..3c0537dd 100644 --- a/sunshine/config.h +++ b/sunshine/config.h @@ -109,9 +109,6 @@ struct sunshine_t { } cmd; std::uint16_t port; - - bool showCredentials; - std::string plainPassword; }; extern video_t video; diff --git a/sunshine/confighttp.cpp b/sunshine/confighttp.cpp index 20beaa6e..97f2f04b 100644 --- a/sunshine/confighttp.cpp +++ b/sunshine/confighttp.cpp @@ -92,17 +92,16 @@ bool authenticate(resp_https_t response, req_https_t request) { return false; } + //If credentials are shown, redirect the user to a /welcome page + if(config::sunshine.username.empty()){ + send_redirect(response,request,"/welcome"); + return false; + } + auto fg = util::fail_guard([&]() { send_unauthorized(response, request); }); - //If credentials are shown, redirect the user to a /welcome page - if(config::sunshine.showCredentials){ - send_redirect(response,request,"/welcome"); - fg.disable(); - return false; - } - auto auth = request->header.find("authorization"); if(auth == request->header.end()) { return false; @@ -203,7 +202,7 @@ void getPasswordPage(resp_https_t response, req_https_t request) { void getWelcomePage(resp_https_t response, req_https_t request) { print_req(request); - if(!config::sunshine.showCredentials){ + if(!config::sunshine.username.empty()){ send_redirect(response,request,"/"); return; } @@ -362,29 +361,6 @@ void getConfig(resp_https_t response, req_https_t request) { } } -void getPlainPassword(resp_https_t response, req_https_t request) { - - print_req(request); - - pt::ptree outputTree; - auto g = util::fail_guard([&]() { - std::ostringstream data; - - pt::write_json(data, outputTree); - response->write(data.str()); - }); - - if(config::sunshine.showCredentials){ - outputTree.put("status", "true"); - outputTree.put("username", config::sunshine.username); - outputTree.put("password", config::sunshine.plainPassword); - config::sunshine.showCredentials = false; - config::sunshine.plainPassword = ""; - } else { - outputTree.put("status", "false"); - } -} - void saveConfig(resp_https_t response, req_https_t request) { if(!authenticate(response, request)) return; @@ -421,7 +397,7 @@ void saveConfig(resp_https_t response, req_https_t request) { } void savePassword(resp_https_t response, req_https_t request) { - if(!authenticate(response, request)) return; + if(!config::sunshine.username.empty() && !authenticate(response, request)) return; print_req(request); @@ -440,27 +416,31 @@ void savePassword(resp_https_t response, req_https_t request) { try { //TODO: Input Validation pt::read_json(ss, inputTree); - auto username = inputTree.get("currentUsername"); + auto username = inputTree.count("currentUsername") > 0 ? inputTree.get("currentUsername") : ""; auto newUsername = inputTree.get("newUsername"); - auto password = inputTree.get("currentPassword"); + auto password = inputTree.count("currentPassword") > 0 ? inputTree.get("currentPassword") : ""; auto newPassword = inputTree.get("newPassword"); auto confirmPassword = inputTree.get("confirmNewPassword"); if(newUsername.length() == 0) newUsername = username; - - auto hash = util::hex(crypto::hash(password + config::sunshine.salt)).to_string(); - if(username == config::sunshine.username && hash == config::sunshine.password) { - if(newPassword != confirmPassword) { - outputTree.put("status", false); - outputTree.put("error", "Password Mismatch"); - } - - http::save_user_creds(config::sunshine.credentials_file, newUsername, newPassword); - http::reload_user_creds(config::sunshine.credentials_file); - outputTree.put("status", true); - } - else { + if(newUsername.length() == 0){ outputTree.put("status", false); - outputTree.put("error", "Invalid Current Credentials"); + outputTree.put("error", "Invalid Username"); + } else { + auto hash = util::hex(crypto::hash(password + config::sunshine.salt)).to_string(); + if(config::sunshine.username.empty() || (username == config::sunshine.username && hash == config::sunshine.password)) { + if(newPassword != confirmPassword) { + outputTree.put("status", false); + outputTree.put("error", "Password Mismatch"); + } else { + http::save_user_creds(config::sunshine.credentials_file, newUsername, newPassword); + http::reload_user_creds(config::sunshine.credentials_file); + outputTree.put("status", true); + } + } + else { + outputTree.put("status", false); + outputTree.put("error", "Invalid Current Credentials"); + } } } catch(std::exception &e) { @@ -525,7 +505,6 @@ void start() { server.resource["^/api/config$"]["POST"] = saveConfig; server.resource["^/api/password$"]["POST"] = savePassword; server.resource["^/api/apps/([0-9]+)$"]["DELETE"] = deleteApp; - server.resource["^/api/setup/password$"]["GET"] = getPlainPassword; server.config.reuse_address = true; server.config.address = "0.0.0.0"s; server.config.port = port_https; diff --git a/sunshine/httpcommon.cpp b/sunshine/httpcommon.cpp index 0520a4f8..14249456 100644 --- a/sunshine/httpcommon.cpp +++ b/sunshine/httpcommon.cpp @@ -54,15 +54,11 @@ int init() { return -1; } } - if(!user_creds_exist(config::sunshine.credentials_file)) { - if(save_user_creds(config::sunshine.credentials_file, "sunshine"s, crypto::rand_alphabet(16), true)) { - return -1; - } + if(user_creds_exist(config::sunshine.credentials_file)) { + if(reload_user_creds(config::sunshine.credentials_file)) return -1; + } else { + BOOST_LOG(info) << "Open the Web UI to set your new username and password and getting started"; } - if(reload_user_creds(config::sunshine.credentials_file)) { - return -1; - } - return 0; } @@ -92,16 +88,6 @@ int save_user_creds(const std::string &file, const std::string &username, const } BOOST_LOG(info) << "New credentials have been created"sv; - - if(run_our_mouth) { - //BOOST_LOG(info) << "Username: "sv << username; - //BOOST_LOG(info) << "Password: "sv << password; - BOOST_LOG(info) << "Open the Web UI to see your new username and password"; - //Save these two in memory to show user and password the first time Sunshine is started - config::sunshine.showCredentials = true; - config::sunshine.plainPassword = password; - } - return 0; }