iamdoubz/OpenBullet
1
0
Fork 0
mirror of https://github.com/openbullet/openbullet.git synced 2023-10-21 07:33:42 -05:00
Code Issues Releases Wiki Activity

Fixed the RandomString function and changed the mask to be hashcat-like.

Browse Source
This commit is contained in:
ruri
2019-04-23 20:00:09 +02:00
parent 177272351e
commit 5e48b3665f
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RuriLib/Blocks/BlockFunction.cs
+29 -9
View File
@@ -588,21 +588,29 @@ namespace RuriLib
break;
case Function.RandomString:
var reserved = new string[] { "?l", "?u", "?d", "?s", "?h", "?a" };
var lowercase = "abcdefghijklmnopqrstuvwxyz";
var uppercase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
var digits = "0123456789";
var symbols = "\\!\"£$%&/()=?^'{}[]@#,;.:-_*+";
var hex = digits + "abcdef";
var allchars = lowercase + uppercase + digits + symbols;
outputString = new string(localInputString
.ToCharArray()
.Select(c => c == 'L' ? lowercase[data.rand.Next(0, lowercase.Length)] : c)
.Select(c => c == 'U' ? uppercase[data.rand.Next(0, uppercase.Length)] : c)
.Select(c => c == 'D' ? digits[data.rand.Next(0, digits.Length)] : c)
.Select(c => c == 'S' ? symbols[data.rand.Next(0, symbols.Length)] : c)
.Select(c => c == 'H' ? hex[data.rand.Next(0, hex.Length)] : c)
.Select(c => c == 'A' ? allchars[data.rand.Next(0, allchars.Length)] : c)
.ToArray());
outputString = localInputString;
while (reserved.Any(r => outputString.Contains(r))){
if (outputString.Contains("?l"))
outputString = outputString.Replace("?l", lowercase[data.rand.Next(0, lowercase.Length)].ToString());
else if (outputString.Contains("?u"))
outputString = outputString.Replace("?u", uppercase[data.rand.Next(0, uppercase.Length)].ToString());
else if (outputString.Contains("?d"))
outputString = outputString.Replace("?d", digits[data.rand.Next(0, digits.Length)].ToString());
else if (outputString.Contains("?s"))
outputString = outputString.Replace("?s", symbols[data.rand.Next(0, symbols.Length)].ToString());
else if (outputString.Contains("?h"))
outputString = outputString.Replace("?h", hex[data.rand.Next(0, hex.Length)].ToString());
else if (outputString.Contains("?a"))
outputString = outputString.Replace("?a", allchars[data.rand.Next(0, allchars.Length)].ToString());
}
break;
case Function.Ceil:
@@ -1043,6 +1051,18 @@ namespace RuriLib
}
#endregion
#region RandomString
private string ReplaceFirst(string text, string search, string replace)
{
int pos = text.IndexOf(search);
if (pos < 0)
{
return text;
}
return text.Substring(0, pos) + replace + text.Substring(pos + search.Length);
}
#endregion
#region AES
/// <summary>
/// Encrypts a string with AES.