Skip to content

Commit f170ccc

Browse files
ComputerEliteComputerElite
authored andcommitted
uri encode password so special characters will work 100%
1 parent 1babdaa commit f170ccc

File tree

4 files changed

+27
-18
lines changed

4 files changed

+27
-18
lines changed

QuestAppVersionSwitcher/Assets/html/script.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -902,9 +902,12 @@ document.getElementById("abortPassword").onclick = () => {
902902
CloseGetPasswordPopup()
903903
}
904904
document.getElementById("confirmPassword").onclick = () => {
905-
options.password = document.getElementById("passwordConfirm").value
905+
options.password = encodeURIComponent(document.getElementById("passwordConfirm").value)
906906
options.app = options.parentName
907-
fetch("/download?body=" + JSON.stringify(options).replace(/&/g, "and")).then(res => {
907+
fetch("/download", {
908+
method: "POST",
909+
body: JSON.stringify(options)
910+
}).then(res => {
908911
res.text().then(text => {
909912
if (res.status == 403) {
910913
TextBoxError("step7box", text)
@@ -923,7 +926,10 @@ function StopDownload(name) {
923926

924927
document.getElementById("logs").onclick = () => {
925928
TextBoxText("logsText", "Collecting information.. please allow us up to 30 seconds to collect everything")
926-
fetch("/questappversionswitcher/uploadlogs?password=" + document.getElementById("logspwd").value).then(res => {
929+
fetch("/questappversionswitcher/uploadlogs", {
930+
method: "POST",
931+
body: encodeURIComponent(document.getElementById("logspwd").value)
932+
}).then(res => {
927933
res.text().then(text => {
928934
if (res.status == 403) {
929935
TextBoxError("logsText", text)
@@ -947,12 +953,15 @@ document.getElementById("confirmLogin").onclick = () => {
947953
}
948954

949955
document.getElementById("tokenPassword").onclick = () => {
950-
options.password = document.getElementById("passwordConfirm").value
956+
options.password = encodeURIComponent(document.getElementById("passwordConfirm").value)
951957
options.app = options.parentName
952-
fetch("/token?body=" + JSON.stringify({
953-
token: params.get("token"),
954-
password: document.getElementById("passwordToken").value
955-
})).then(res => {
958+
fetch("/token", {
959+
method: "POST",
960+
body: JSON.stringify({
961+
token: params.get("token"),
962+
password: encodeURIComponent(document.getElementById("passwordToken").value)
963+
})
964+
}).then(res => {
956965
res.text().then(text => {
957966
if (res.status == 200) {
958967
TextBoxGood("step8box", text)

QuestAppVersionSwitcher/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.10.3" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="51">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.10.4" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="52">
33
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="32" />
44
<uses-permission android:name="oculus.permission.handtracking" />
55
<uses-permission android:name="com.oculus.permission.HAND_TRACKING" />

QuestAppVersionSwitcher/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
// Minor Version
2323
// Build Number
2424
// Revision
25-
[assembly: AssemblyVersion("1.10.3.0")]
26-
[assembly: AssemblyFileVersion("1.10.3.0")]
25+
[assembly: AssemblyVersion("1.10.4.0")]
26+
[assembly: AssemblyFileVersion("1.10.4.0")]

QuestAppVersionSwitcher/WebServer.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ public void Start()
453453
serverRequest.SendString("Uninstall request sent");
454454
return true;
455455
}));
456-
server.AddRoute("GET", "/questappversionswitcher/uploadlogs", new Func<ServerRequest, bool>(request =>
456+
server.AddRoute("POST", "/questappversionswitcher/uploadlogs", new Func<ServerRequest, bool>(request =>
457457
{
458458
Logger.Log("\n\n------Log upload requested------");
459459
QAVSReport report = new QAVSReport();
@@ -466,13 +466,13 @@ public void Start()
466466
{
467467
try
468468
{
469-
if (GetSHA256OfString(request.queryString.Get("password")) != CoreService.coreVars.password)
469+
if (GetSHA256OfString(request.bodyString) != CoreService.coreVars.password)
470470
{
471471
request.SendString("Password is wrong. Please try a different password or set a new one", "text/plain", 403);
472472
return true;
473473
}
474474
GraphQLClient.log = false;
475-
GraphQLClient.oculusStoreToken = PasswordEncryption.Decrypt(CoreService.coreVars.token, request.queryString.Get("password"));
475+
GraphQLClient.oculusStoreToken = PasswordEncryption.Decrypt(CoreService.coreVars.token, request.bodyString);
476476
ViewerData<OculusUserWrapper> entitlements = GraphQLClient.GetActiveEntitelments();
477477
foreach (Entitlement e in entitlements.data.viewer.user.active_entitlements.nodes)
478478
{
@@ -927,9 +927,9 @@ public void Start()
927927
serverRequest.SendString(SizeConverter.ByteSizeToString(FileManager.GetDirSize(CoreService.coreVars.QAVSBackupDir)));
928928
return true;
929929
}));
930-
server.AddRoute("GET", "/token", new Func<ServerRequest, bool>(serverRequest =>
930+
server.AddRoute("POST", "/token", new Func<ServerRequest, bool>(serverRequest =>
931931
{
932-
TokenRequest r = JsonSerializer.Deserialize<TokenRequest>(serverRequest.queryString.Get("body"));
932+
TokenRequest r = JsonSerializer.Deserialize<TokenRequest>(serverRequest.bodyString);
933933
if (r.token.Contains("%"))
934934
{
935935
serverRequest.SendString("You got your token from the wrong place. Go to the payload tab. Don't get it from the url.", "text/plain", 400);
@@ -952,9 +952,9 @@ public void Start()
952952
serverRequest.SendString("Set token");
953953
return true;
954954
}));
955-
server.AddRoute("GET", "/download", new Func<ServerRequest, bool>(serverRequest =>
955+
server.AddRoute("POST", "/download", new Func<ServerRequest, bool>(serverRequest =>
956956
{
957-
DownloadRequest r = JsonSerializer.Deserialize<DownloadRequest>(serverRequest.queryString.Get("body"));
957+
DownloadRequest r = JsonSerializer.Deserialize<DownloadRequest>(serverRequest.bodyString);
958958
if (GetSHA256OfString(r.password) != CoreService.coreVars.password)
959959
{
960960
serverRequest.SendString("Password is wrong. Please try a different password or set a new one", "text/plain", 403);

0 commit comments

Comments
 (0)