Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-05 00:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an option to keep sensitive details, #610

Browse Source 
I completely forgot that we intentionally omit sensitive details, so bot config update API should have a way to inherit them without exposing, this will do.

Note to self: ALWAYS use custom JSON classes, so I won't need to break API just like like now, at worst I'll add new acceptable properties.
This commit is contained in:
JustArchi
2017-12-09 23:15:33 +01:00
parent a9faf30f8a
commit 5235339fbb
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ArchiSteamFarm/IPC.cs
View File

@@ -21,6 +21,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.IO.Compression;
using System.Linq;
@@ -230,18 +231,34 @@ namespace ArchiSteamFarm {
return true;
}
BotConfig botConfig;
BotRequest botRequest;
try {
botConfig = JsonConvert.DeserializeObject<BotConfig>(body);
botRequest = JsonConvert.DeserializeObject<BotRequest>(body);
} catch (Exception e) {
await ResponseJsonObject(request, response, new GenericResponse(false, string.Format(Strings.ErrorParsingObject, nameof(botConfig)) + Environment.NewLine + e), HttpStatusCode.BadRequest).ConfigureAwait(false);
await ResponseJsonObject(request, response, new GenericResponse(false, string.Format(Strings.ErrorParsingObject, nameof(botRequest)) + Environment.NewLine + e), HttpStatusCode.BadRequest).ConfigureAwait(false);
return true;
}
string filePath = Path.Combine(SharedInfo.ConfigDirectory, WebUtility.UrlDecode(arguments[argumentsIndex]) + ".json");
string botName = WebUtility.UrlDecode(arguments[argumentsIndex]);
if (!await BotConfig.Write(filePath, botConfig).ConfigureAwait(false)) {
if (botRequest.KeepSensitiveDetails && Bot.Bots.TryGetValue(botName, out Bot bot)) {
if (string.IsNullOrEmpty(botRequest.BotConfig.SteamLogin)) {
botRequest.BotConfig.SteamLogin = bot.BotConfig.SteamLogin;
}
if (string.IsNullOrEmpty(botRequest.BotConfig.SteamParentalPIN)) {
botRequest.BotConfig.SteamParentalPIN = bot.BotConfig.SteamParentalPIN;
}
if (string.IsNullOrEmpty(botRequest.BotConfig.SteamPassword)) {
botRequest.BotConfig.SteamPassword = bot.BotConfig.SteamPassword;
}
}
string filePath = Path.Combine(SharedInfo.ConfigDirectory, botName + ".json");
if (!await BotConfig.Write(filePath, botRequest.BotConfig).ConfigureAwait(false)) {
await ResponseJsonObject(request, response, new GenericResponse(false, "Writing bot config failed, check ASF log for details"), HttpStatusCode.BadRequest).ConfigureAwait(false);
return true;
}
@@ -498,6 +515,18 @@ namespace ArchiSteamFarm {
await ResponseString(request, response, text, "text/plain", statusCode).ConfigureAwait(false);
}
[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
private sealed class BotRequest {
[JsonProperty(Required = Required.Always)]
internal readonly BotConfig BotConfig;
[JsonProperty(Required = Required.DisallowNull)]
internal readonly bool KeepSensitiveDetails = true;
// Deserialized from JSON
private BotRequest() { }
}
private sealed class GenericResponse {
[JsonProperty]
internal readonly string Message;