simono41/steamguard-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed anything that had to do with encrypted maFiles because I can't reference System.Security.dll with mcs :(

Browse source 
Will fix later.
This commit is contained in:
Carson McManus 2016-08-21 17:02:17 -04:00
parent afcf0a8d1d
commit 02c275a7d0
2 changed files with 48 additions and 280 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

313
Program.cs
View file

@ -12,6 +12,8 @@ public static class Program
const string defaultSteamGuardPath = "~/maFiles"; const string defaultSteamGuardPath = "~/maFiles";
public static string SteamGuardPath { get; set; } = defaultSteamGuardPath; public static string SteamGuardPath { get; set; } = defaultSteamGuardPath;
public static Manifest Manifest { get; set; }
public static SteamGuardAccount[] SteamGuardAccounts { get; set; }
/// <summary> /// <summary>
/// The main entry point for the application /// The main entry point for the application
@ -41,6 +43,10 @@ public static class Program
return; return;
} }
} }
// Load the manifest and stuff
Manifest = Manifest.GetManifest();
SteamGuardAccounts = Manifest.GetAllAccounts();
} }
} }
@ -86,7 +92,7 @@ public class Manifest
} }
// Find config dir and manifest file // Find config dir and manifest file
string maDir = Manifest.GetExecutableDir() + "/maFiles/"; string maDir = Program.SteamGuardPath;
string maFile = maDir + "manifest.json"; string maFile = maDir + "manifest.json";
// If there's no config dir, create it // If there's no config dir, create it
@ -139,7 +145,7 @@ public class Manifest
// Take a pre-manifest version and generate a manifest for it. // Take a pre-manifest version and generate a manifest for it.
if (scanDir) if (scanDir)
{ {
string maDir = Manifest.GetExecutableDir() + "/maFiles/"; string maDir = Program.SteamGuardPath + "/maFiles/";
if (Directory.Exists(maDir)) if (Directory.Exists(maDir))
{ {
DirectoryInfo dir = new DirectoryInfo(maDir); DirectoryInfo dir = new DirectoryInfo(maDir);
@ -192,23 +198,17 @@ public class Manifest
} }
bool passKeyValid = false; bool passKeyValid = false;
string passKey = null; string passKey = "";
while (!passKeyValid) while (!passKeyValid)
{ {
InputForm passKeyForm = new InputForm("Please enter your encryption passkey.", true); Console.WriteLine("Please enter encryption password: ");
passKeyForm.ShowDialog(); passKey = Console.ReadLine();
if (!passKeyForm.Canceled) if (passKey == "")
{ continue;
passKey = passKeyForm.txtBox.Text;
passKeyValid = this.VerifyPasskey(passKey); passKeyValid = this.VerifyPasskey(passKey);
if (!passKeyValid) if (!passKeyValid)
{ {
MessageBox.Show("That passkey is invalid."); Console.WriteLine("Incorrect.");
}
}
else
{
return null;
} }
} }
return passKey; return passKey;
@ -216,39 +216,37 @@ public class Manifest
public string PromptSetupPassKey(string initialPrompt = "Enter passkey, or hit cancel to remain unencrypted.") public string PromptSetupPassKey(string initialPrompt = "Enter passkey, or hit cancel to remain unencrypted.")
{ {
InputForm newPassKeyForm = new InputForm(initialPrompt); Console.Write("Would you like to use encryption? [Y/n] ");
newPassKeyForm.ShowDialog(); string doEncryptAnswer = Console.ReadLine();
if (newPassKeyForm.Canceled || newPassKeyForm.txtBox.Text.Length == 0) if (doEncryptAnswer == "n" || doEncryptAnswer == "N")
{ {
MessageBox.Show("WARNING: You chose to not encrypt your files. Doing so imposes a security risk for yourself. If an attacker were to gain access to your computer, they could completely lock you out of your account and steal all your items."); Console.WriteLine("WARNING: You chose to not encrypt your files. Doing so imposes a security risk for yourself. If an attacker were to gain access to your computer, they could completely lock you out of your account and steal all your items.");
return null; return null;
} }
InputForm newPassKeyForm2 = new InputForm("Confirm new passkey."); string newPassKey = "";
newPassKeyForm2.ShowDialog(); string confirmPassKey = "";
if (newPassKeyForm2.Canceled) do
{ {
MessageBox.Show("WARNING: You chose to not encrypt your files. Doing so imposes a security risk for yourself. If an attacker were to gain access to your computer, they could completely lock you out of your account and steal all your items."); Console.Write("Enter passkey: ");
return null; newPassKey = Console.ReadLine();
} Console.Write("Confirm passkey: ");
confirmPassKey = Console.ReadLine();
string newPassKey = newPassKeyForm.txtBox.Text;
string confirmPassKey = newPassKeyForm2.txtBox.Text;
if (newPassKey != confirmPassKey) if (newPassKey != confirmPassKey)
{ {
MessageBox.Show("Passkeys do not match."); Console.WriteLine("Passkeys do not match.");
return null;
} }
} while (newPassKey != confirmPassKey);
if (!this.ChangeEncryptionKey(null, newPassKey)) if (!this.ChangeEncryptionKey(null, newPassKey))
{ {
MessageBox.Show("Unable to set passkey."); Console.WriteLine("Unable to set passkey.");
return null; return null;
} }
else else
{ {
MessageBox.Show("Passkey successfully set."); Console.WriteLine("Passkey successfully set.");
} }
return newPassKey; return newPassKey;
@ -257,7 +255,7 @@ public class Manifest
public SteamAuth.SteamGuardAccount[] GetAllAccounts(string passKey = null, int limit = -1) public SteamAuth.SteamGuardAccount[] GetAllAccounts(string passKey = null, int limit = -1)
{ {
if (passKey == null && this.Encrypted) return new SteamGuardAccount[0]; if (passKey == null && this.Encrypted) return new SteamGuardAccount[0];
string maDir = Manifest.GetExecutableDir() + "/maFiles/"; string maDir = Program.SteamGuardPath + "/maFiles/";
List<SteamAuth.SteamGuardAccount> accounts = new List<SteamAuth.SteamGuardAccount>(); List<SteamAuth.SteamGuardAccount> accounts = new List<SteamAuth.SteamGuardAccount>();
foreach (var entry in this.Entries) foreach (var entry in this.Entries)
@ -265,9 +263,10 @@ public class Manifest
string fileText = File.ReadAllText(maDir + entry.Filename); string fileText = File.ReadAllText(maDir + entry.Filename);
if (this.Encrypted) if (this.Encrypted)
{ {
string decryptedText = FileEncryptor.DecryptData(passKey, entry.Salt, entry.IV, fileText); throw new NotSupportedException("Encrypted maFiles are not supported at this time.");
if (decryptedText == null) return new SteamGuardAccount[0]; //string decryptedText = FileEncryptor.DecryptData(passKey, entry.Salt, entry.IV, fileText);
fileText = decryptedText; //if (decryptedText == null) return new SteamGuardAccount[0];
//fileText = decryptedText;
} }
var account = JsonConvert.DeserializeObject<SteamAuth.SteamGuardAccount>(fileText); var account = JsonConvert.DeserializeObject<SteamAuth.SteamGuardAccount>(fileText);
@ -283,48 +282,7 @@ public class Manifest
public bool ChangeEncryptionKey(string oldKey, string newKey) public bool ChangeEncryptionKey(string oldKey, string newKey)
{ {
if (this.Encrypted) throw new NotSupportedException("Encrypted maFiles are not supported at this time.");
{
if (!this.VerifyPasskey(oldKey))
{
return false;
}
}
bool toEncrypt = newKey != null;
string maDir = Manifest.GetExecutableDir() + "/maFiles/";
for (int i = 0; i < this.Entries.Count; i++)
{
ManifestEntry entry = this.Entries[i];
string filename = maDir + entry.Filename;
if (!File.Exists(filename)) continue;
string fileContents = File.ReadAllText(filename);
if (this.Encrypted)
{
fileContents = FileEncryptor.DecryptData(oldKey, entry.Salt, entry.IV, fileContents);
}
string newSalt = null;
string newIV = null;
string toWriteFileContents = fileContents;
if (toEncrypt)
{
newSalt = FileEncryptor.GetRandomSalt();
newIV = FileEncryptor.GetInitializationVector();
toWriteFileContents = FileEncryptor.EncryptData(newKey, newSalt, newIV, fileContents);
}
File.WriteAllText(filename, toWriteFileContents);
entry.IV = newIV;
entry.Salt = newSalt;
}
this.Encrypted = toEncrypt;
this.Save();
return true;
} }
public bool VerifyPasskey(string passkey) public bool VerifyPasskey(string passkey)
@ -340,7 +298,7 @@ public class Manifest
ManifestEntry entry = (from e in this.Entries where e.SteamID == account.Session.SteamID select e).FirstOrDefault(); ManifestEntry entry = (from e in this.Entries where e.SteamID == account.Session.SteamID select e).FirstOrDefault();
if (entry == null) return true; // If something never existed, did you do what they asked? if (entry == null) return true; // If something never existed, did you do what they asked?
string maDir = Manifest.GetExecutableDir() + "/maFiles/"; string maDir = Program.SteamGuardPath + "/maFiles/";
string filename = maDir + entry.Filename; string filename = maDir + entry.Filename;
this.Entries.Remove(entry); this.Entries.Remove(entry);
@ -376,14 +334,10 @@ public class Manifest
if (encrypt) if (encrypt)
{ {
salt = FileEncryptor.GetRandomSalt(); throw new NotSupportedException("Encrypted maFiles are not supported at this time.");
iV = FileEncryptor.GetInitializationVector();
string encrypted = FileEncryptor.EncryptData(passKey, salt, iV, jsonAccount);
if (encrypted == null) return false;
jsonAccount = encrypted;
} }
string maDir = Manifest.GetExecutableDir() + "/maFiles/"; string maDir = Program.SteamGuardPath + "/maFiles/";
string filename = account.Session.SteamID.ToString() + ".maFile"; string filename = account.Session.SteamID.ToString() + ".maFile";
ManifestEntry newEntry = new ManifestEntry() ManifestEntry newEntry = new ManifestEntry()
@ -432,7 +386,7 @@ public class Manifest
public bool Save() public bool Save()
{ {
string maDir = Manifest.GetExecutableDir() + "/maFiles/"; string maDir = Program.SteamGuardPath + "/maFiles/";
string filename = maDir + "manifest.json"; string filename = maDir + "manifest.json";
if (!Directory.Exists(maDir)) if (!Directory.Exists(maDir))
{ {
@ -461,7 +415,7 @@ public class Manifest
private void RecomputeExistingEntries() private void RecomputeExistingEntries()
{ {
List<ManifestEntry> newEntries = new List<ManifestEntry>(); List<ManifestEntry> newEntries = new List<ManifestEntry>();
string maDir = Manifest.GetExecutableDir() + "/maFiles/"; string maDir = Program.SteamGuardPath + "/maFiles/";
foreach (var entry in this.Entries) foreach (var entry in this.Entries)
{ {
@ -504,190 +458,3 @@ public class Manifest
public ulong SteamID { get; set; } public ulong SteamID { get; set; }
} }
} }
/// <summary>
/// This class provides the controls that will encrypt and decrypt the *.maFile files
///
/// Passwords entered will be passed into 100k rounds of PBKDF2 (RFC2898) with a cryptographically random salt.
/// The generated key will then be passed into AES-256 (RijndalManaged) which will encrypt the data
/// in cypher block chaining (CBC) mode, and then write both the PBKDF2 salt and encrypted data onto the disk.
/// </summary>
public static class FileEncryptor
{
private const int PBKDF2_ITERATIONS = 50000; //Set to 50k to make program not unbearably slow. May increase in future.
private const int SALT_LENGTH = 8;
private const int KEY_SIZE_BYTES = 32;
private const int IV_LENGTH = 16;
/// <summary>
/// Returns an 8-byte cryptographically random salt in base64 encoding
/// </summary>
/// <returns></returns>
public static string GetRandomSalt()
{
byte[] salt = new byte[SALT_LENGTH];
using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
{
rng.GetBytes(salt);
}
return Convert.ToBase64String(salt);
}
/// <summary>
/// Returns a 16-byte cryptographically random initialization vector (IV) in base64 encoding
/// </summary>
/// <returns></returns>
public static string GetInitializationVector()
{
byte[] IV = new byte[IV_LENGTH];
using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
{
rng.GetBytes(IV);
}
return Convert.ToBase64String(IV);
}
/// <summary>
/// Generates an encryption key derived using a password, a random salt, and specified number of rounds of PBKDF2
///
/// TODO: pass in password via SecureString?
/// </summary>
/// <param name="password"></param>
/// <param name="salt"></param>
/// <returns></returns>
private static byte[] GetEncryptionKey(string password, string salt)
{
if (string.IsNullOrEmpty(password))
{
throw new ArgumentException("Password is empty");
}
if (string.IsNullOrEmpty(salt))
{
throw new ArgumentException("Salt is empty");
}
using (Rfc2898DeriveBytes pbkdf2 = new Rfc2898DeriveBytes(password, Convert.FromBase64String(salt), PBKDF2_ITERATIONS))
{
return pbkdf2.GetBytes(KEY_SIZE_BYTES);
}
}
/// <summary>
/// Tries to decrypt and return data given an encrypted base64 encoded string. Must use the same
/// password, salt, IV, and ciphertext that was used during the original encryption of the data.
/// </summary>
/// <param name="password"></param>
/// <param name="passwordSalt"></param>
/// <param name="IV">Initialization Vector</param>
/// <param name="encryptedData"></param>
/// <returns></returns>
public static string DecryptData(string password, string passwordSalt, string IV, string encryptedData)
{
if (string.IsNullOrEmpty(password))
{
throw new ArgumentException("Password is empty");
}
if (string.IsNullOrEmpty(passwordSalt))
{
throw new ArgumentException("Salt is empty");
}
if (string.IsNullOrEmpty(IV))
{
throw new ArgumentException("Initialization Vector is empty");
}
if (string.IsNullOrEmpty(encryptedData))
{
throw new ArgumentException("Encrypted data is empty");
}
byte[] cipherText = Convert.FromBase64String(encryptedData);
byte[] key = GetEncryptionKey(password, passwordSalt);
string plaintext = null;
using (RijndaelManaged aes256 = new RijndaelManaged())
{
aes256.IV = Convert.FromBase64String(IV);
aes256.Key = key;
aes256.Padding = PaddingMode.PKCS7;
aes256.Mode = CipherMode.CBC;
//create decryptor to perform the stream transform
ICryptoTransform decryptor = aes256.CreateDecryptor(aes256.Key, aes256.IV);
//wrap in a try since a bad password yields a bad key, which would throw an exception on decrypt
try
{
using (MemoryStream msDecrypt = new MemoryStream(cipherText))
{
using (CryptoStream csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read))
{
using (StreamReader srDecrypt = new StreamReader(csDecrypt))
{
plaintext = srDecrypt.ReadToEnd();
}
}
}
}
catch (CryptographicException)
{
plaintext = null;
}
}
return plaintext;
}
/// <summary>
/// Encrypts a string given a password, salt, and initialization vector, then returns result in base64 encoded string.
///
/// To retrieve this data, you must decrypt with the same password, salt, IV, and cyphertext that was used during encryption
/// </summary>
/// <param name="password"></param>
/// <param name="passwordSalt"></param>
/// <param name="IV"></param>
/// <param name="plaintext"></param>
/// <returns></returns>
public static string EncryptData(string password, string passwordSalt, string IV, string plaintext)
{
if (string.IsNullOrEmpty(password))
{
throw new ArgumentException("Password is empty");
}
if (string.IsNullOrEmpty(passwordSalt))
{
throw new ArgumentException("Salt is empty");
}
if (string.IsNullOrEmpty(IV))
{
throw new ArgumentException("Initialization Vector is empty");
}
if (string.IsNullOrEmpty(plaintext))
{
throw new ArgumentException("Plaintext data is empty");
}
byte[] key = GetEncryptionKey(password, passwordSalt);
byte[] ciphertext;
using (RijndaelManaged aes256 = new RijndaelManaged())
{
aes256.Key = key;
aes256.IV = Convert.FromBase64String(IV);
aes256.Padding = PaddingMode.PKCS7;
aes256.Mode = CipherMode.CBC;
ICryptoTransform encryptor = aes256.CreateEncryptor(aes256.Key, aes256.IV);
using (MemoryStream msEncrypt = new MemoryStream())
{
using (CryptoStream csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write))
{
using (StreamWriter swEncypt = new StreamWriter(csEncrypt))
{
swEncypt.Write(plaintext);
}
ciphertext = msEncrypt.ToArray();
}
}
}
return Convert.ToBase64String(ciphertext);
}
}

5
makefile
View file

@ -1,4 +1,5 @@
all: Program.cs all: Program.cs
nuget restore SteamAuth/SteamAuth/SteamAuth.sln nuget restore SteamAuth/SteamAuth/SteamAuth.sln
mcs -target:library -out:build/libSteamAuth.so -r:SteamAuth/SteamAuth/packages/Newtonsoft.Json.7.0.1/lib/net45/Newtonsoft.Json.dll SteamAuth/SteamAuth/APIEndpoints.cs SteamAuth/SteamAuth/AuthenticatorLinker.cs SteamAuth/SteamAuth/Confirmation.cs SteamAuth/SteamAuth/SessionData.cs SteamAuth/SteamAuth/SteamGuardAccount.cs SteamAuth/SteamAuth/SteamWeb.cs SteamAuth/SteamAuth/TimeAligner.cs SteamAuth/SteamAuth/UserLogin.cs SteamAuth/SteamAuth/Util.cs SteamAuth/SteamAuth/Properties/AssemblyInfo.cs mcs -target:library -out:build/SteamAuth.dll -r:SteamAuth/SteamAuth/packages/Newtonsoft.Json.7.0.1/lib/net45/Newtonsoft.Json.dll SteamAuth/SteamAuth/APIEndpoints.cs SteamAuth/SteamAuth/AuthenticatorLinker.cs SteamAuth/SteamAuth/Confirmation.cs SteamAuth/SteamAuth/SessionData.cs SteamAuth/SteamAuth/SteamGuardAccount.cs SteamAuth/SteamAuth/SteamWeb.cs SteamAuth/SteamAuth/TimeAligner.cs SteamAuth/SteamAuth/UserLogin.cs SteamAuth/SteamAuth/Util.cs SteamAuth/SteamAuth/Properties/AssemblyInfo.cs
mcs -out:build/steamguard -r:build/libSteamAuth.so -r:SteamAuth/SteamAuth/packages/Newtonsoft.Json.7.0.1/lib/net45/Newtonsoft.Json.dll Program.cs cp SteamAuth/SteamAuth/packages/Newtonsoft.Json.7.0.1/lib/net45/Newtonsoft.Json.dll build/
mcs -out:build/steamguard -r:build/SteamAuth.dll -r:build/Newtonsoft.Json.dll Program.cs