themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Added basic system for logging in and adding users ingame.

Browse source
This commit is contained in:
Lucas Nicodemus 2011-06-30 19:41:37 -06:00
parent c52e8cbf5d
commit da055867c9
4 changed files with 146 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

70
TShockAPI/Commands.cs
View file

@ -144,6 +144,8 @@ namespace TShockAPI
ChatCommands.Add(new Command("p", "", PartyChat));
ChatCommands.Add(new Command("rules", "", Rules));
ChatCommands.Add(new Command("displaylogs", "logs", Rules));
ChatCommands.Add(new Command("user", "manageusers", ManageUsers));
ChatCommands.Add(new Command("login", "", AttemptLogin));
if (ConfigurationManager.DistributationAgent != "terraria-online")
{
ChatCommands.Add(new Command("kill", "kill", Kill));
@ -157,7 +159,7 @@ namespace TShockAPI
public static void AddUpdateCommand()
{
Commands.ChatCommands.Add(new Command("updatenow", "maintenance", Commands.UpdateNow));
//Commands.ChatCommands.Add(new Command("updatenow", "maintenance", Commands.UpdateNow));
}
public static bool HandleCommand(TSPlayer player, string text)
@ -280,6 +282,72 @@ namespace TShockAPI
return c == ' ' || c == '\t' || c == '\n';
}
#region Account commands
public static void AttemptLogin(CommandArgs args)
{
if (args.Parameters.Count != 2)
{
args.Player.SendMessage("Syntax: /login [username] [password]");
args.Player.SendMessage("If you forgot your password, there is no way to recover it.");
return;
}
string encrPass = Tools.HashPassword(args.Parameters[1]);
string[] exr = Tools.FetchHashedPasswordAndGroup(args.Parameters[0]);
if (exr[0] == Tools.HashPassword(args.Parameters[1]))
{
args.Player.Group = Tools.GetGroup(exr[1]);
args.Player.SendMessage("Authenticated as " + args.Parameters[0] + "successfully.", Color.LimeGreen);
return;
} else
{
args.Player.SendMessage("Invalid login attempt. This incident has been reported.", Color.Red);
Log.Warn(args.Player.IP + " failed to authenticate as " + args.Parameters[0]);
args.Player.LoginAttempts++;
return;
}
}
private static void ManageUsers(CommandArgs args)
{
if (args.Parameters.Count < 3)
{
args.Player.SendMessage("Syntax: /user add <ip/user:pass> [group]");
args.Player.SendMessage("Note: Passwords are stored with very basic Hashion. To reset a user's password, remove and re-add them.");
return;
}
if (args.Parameters.Count > 2)
{
if (args.Parameters[0] == "add")
{
if (args.Parameters[1].Split(':').Length == 2)
{
TextWriter tw = new StreamWriter(FileTools.UsersPath, true);
tw.WriteLine("\n" + args.Parameters[1].Split(':')[0] + ":" + Tools.HashPassword(args.Parameters[1].Split(':')[0]) + " " + args.Parameters[2]);
tw.Close();
//Notify the admin that they can now login
return;
}
else if (args.Parameters[1].Split(':').Length == 1)
{
TextWriter tw = new StreamWriter(FileTools.UsersPath, true);
tw.WriteLine("\n" + args.Parameters[1] + " " + args.Parameters[2]);
tw.Close();
//Notify the admin that they can now login if they rejoin
//Notify admin that this is fucking insecure
return;
}
else
{
args.Player.SendMessage("Invalid syntax. Try /user help.", Color.Red);
}
}
}
}
#endregion
#region Player Management Commands
private static void Kick(CommandArgs args)

1
TShockAPI/TSPlayer.cs
View file

@ -40,6 +40,7 @@ namespace TShockAPI
public bool InitSpawn = false;
public bool DisplayLogs = true;
public Vector2 oldSpawn = Vector2.Zero;
public int LoginAttempts { get; set; }
public bool RealPlayer
{

75
TShockAPI/Tools.cs
View file

@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Collections.Generic;
using System.IO;
using System.Security.Cryptography;
using System.Text;
using System.Net;
using Microsoft.Xna.Framework;
@ -552,6 +553,10 @@ namespace TShockAPI
{
continue;
}
if (args[0].Contains(":"))
{
continue;
}
if (lines[i].StartsWith("#"))
{
continue;
@ -568,6 +573,49 @@ namespace TShockAPI
sr.Close();
return GetGroup("default");
}
/// <summary>
/// Fetches the hashed password and group for a given username
/// </summary>
/// <param name="username">string username</param>
/// <returns>string[] {password, group}</returns>
public static string[] FetchHashedPasswordAndGroup(string username)
{
StreamReader sr = new StreamReader(FileTools.UsersPath);
string data = sr.ReadToEnd();
data = data.Replace("\r", "");
string[] lines = data.Split('\n');
string[] result = {"null", "null"};
for (int i = 0; i < lines.Length; i++)
{
string[] args = lines[i].Split(' ');
if (args.Length < 2)
{
continue;
}
if (lines[i].StartsWith("#"))
{
continue;
}
if (!lines[i].Contains(":"))
{
continue;
}
try
{
if (args[0].Split(':')[0].ToLower() == username.ToLower())
{
result = new string[] {args[0].Split(':')[1], args[1]};
return result;
}
}
catch (Exception ex)
{ Log.Error(ex.ToString()); }
}
sr.Close();
return result;
}
/// <summary>
/// Returns an IPv4 address from a DNS query
@ -586,5 +634,32 @@ namespace TShockAPI
}
return IP4Address;
}
/// <summary>
/// Returns a byte array for a given string
/// </summary>
/// <param name="str">string str</param>
/// <returns>byte[] string</returns>
public static byte[] StrToByteArray(string str)
{
System.Text.UTF8Encoding encoding = new System.Text.UTF8Encoding();
return encoding.GetBytes(str);
}
/// <summary>
/// Returns a Sha256 string for a given string
/// </summary>
/// <param name="password">string password</param>
/// <returns>string sha256</returns>
public static string HashPassword(string password)
{
byte[] data = StrToByteArray(password);
byte[] result;
using (SHA256 shaM = new SHA256Managed())
{
result = shaM.ComputeHash(data);
}
System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
return enc.GetString(result);
}
}
}

2
TShockAPI/UpdateManager.cs
View file

@ -107,7 +107,7 @@ namespace TShockAPI
private static void NotifyAdministrator(TSPlayer player, string[] changes)
{
player.SendMessage("The server is out of date. To update, type /updatenow.");
player.SendMessage("The server is out of date.", Color.Red);
for (int j = 4; j < changes.Length; j++)
{
player.SendMessage(changes[j], Color.Red);