继续修正
This commit is contained in:
parent
c7bc5cec65
commit
669eec7795
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
|
||||
<Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
@ -67,10 +67,10 @@
|
||||
<HintPath>..\packages\BouncyCastle.Cryptography.2.4.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
|
||||
<HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
|
||||
<HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Google.Protobuf, Version=3.28.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Google.Protobuf.3.28.0\lib\net45\Google.Protobuf.dll</HintPath>
|
||||
@ -236,8 +236,8 @@
|
||||
<PropertyGroup>
|
||||
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
|
||||
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.props'))" />
|
||||
<Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
|
||||
<Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" />
|
||||
</Project>
|
||||
@ -1,6 +1,9 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Security.Cryptography;
|
||||
using Org.BouncyCastle.Crypto.Parameters;
|
||||
using Org.BouncyCastle.Security;
|
||||
using Org.BouncyCastle.OpenSsl;
|
||||
using PSO2SERVER.Crypto;
|
||||
|
||||
namespace PSO2SERVER.Packets.Handlers
|
||||
@ -20,7 +23,7 @@ namespace PSO2SERVER.Packets.Handlers
|
||||
|
||||
// Extract the first 0x80 bytes into a separate array
|
||||
var cryptedBlob = new byte[0x80];
|
||||
var rsaBlob = File.ReadAllBytes("privateKey.blob");
|
||||
var rsaBlob = File.ReadAllBytes(ServerApp.ServerPrivateKey);
|
||||
|
||||
Array.Copy(data, position, cryptedBlob, 0, 0x80);
|
||||
Array.Reverse(cryptedBlob);
|
||||
@ -49,7 +52,7 @@ namespace PSO2SERVER.Packets.Handlers
|
||||
context.Socket.Close();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Also a failure.
|
||||
if (decryptedBlob.Length < 0x20)
|
||||
return;
|
||||
|
||||
@ -43,7 +43,7 @@ namespace PSO2SERVER.Packets.Handlers
|
||||
// Check if there is an empty field
|
||||
if (string.IsNullOrWhiteSpace(username) || string.IsNullOrWhiteSpace(password))
|
||||
{
|
||||
error = "Username and password fields must not be empty.";
|
||||
error = "用户名或密码为空.";
|
||||
user = null;
|
||||
}
|
||||
// Check for special characters
|
||||
@ -61,7 +61,7 @@ namespace PSO2SERVER.Packets.Handlers
|
||||
Password = BCrypt.Net.BCrypt.HashPassword(password),
|
||||
Nickname = username.ToLower(),
|
||||
// Since we can't display the nickname prompt yet, just default it to the username
|
||||
SettingsIni = File.ReadAllText("Resources/settings.txt")
|
||||
SettingsIni = File.ReadAllText(ServerApp.ServerSettingsKey)
|
||||
};
|
||||
db.Players.Add(user);
|
||||
db.SaveChanges();
|
||||
@ -74,7 +74,7 @@ namespace PSO2SERVER.Packets.Handlers
|
||||
user = users.First();
|
||||
if (!BCrypt.Net.BCrypt.Verify(password, user.Password))
|
||||
{
|
||||
error = "Incorrect password.";
|
||||
error = "密码错误.";
|
||||
user = null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,6 +23,16 @@ namespace PSO2SERVER
|
||||
public const string ServerVersion = "v0.1.1";
|
||||
public const string ServerVersionName = "Sancaros";
|
||||
|
||||
public const string ServerSettingsKey = "Resources\\settings.txt";
|
||||
|
||||
// 密钥BLOB格式
|
||||
public const string ServerPrivateKey = "key\\privateKey.blob";
|
||||
public const string ServerPublicKey = "key\\publicKey.blob";
|
||||
|
||||
// 密钥PEM格式
|
||||
public const string ServerPrivatePem = "key\\privateKey.pem";
|
||||
public const string ServerSEGAPem = "key\\SEGAKey.pem";
|
||||
|
||||
public static IPAddress BindAddress = IPAddress.Parse("127.0.0.1");
|
||||
public static Config Config;
|
||||
public static ConsoleSystem ConsoleSystem;
|
||||
@ -79,24 +89,24 @@ namespace PSO2SERVER
|
||||
}
|
||||
|
||||
// Check for settings.txt [AIDA]
|
||||
if (!File.Exists("Resources/settings.txt"))
|
||||
if (!File.Exists(ServerSettingsKey))
|
||||
{
|
||||
// If it doesn't exist, throw an error and quit [AIDA]
|
||||
Logger.WriteError("[ERR] 载入 settings.txt 文件错误. 按任意键退出.");
|
||||
Logger.WriteError("[ERR] 载入 {0} 文件错误. 按任意键退出.", ServerSettingsKey);
|
||||
Console.ReadKey();
|
||||
Environment.Exit(0);
|
||||
}
|
||||
|
||||
// Check for Private Key BLOB [AIDA]
|
||||
if (!File.Exists("privateKey.blob"))
|
||||
if (!File.Exists(ServerPrivateKey))
|
||||
{
|
||||
// If it doesn't exist, generate a fresh keypair [CK]
|
||||
Logger.WriteWarning("[WRN] 未找到 privatekey.blob 文件, 正在生成新的密钥...");
|
||||
Logger.WriteWarning("[WRN] 未找到 {0} 文件, 正在生成新的密钥...", ServerPrivateKey);
|
||||
RSACryptoServiceProvider rcsp = new RSACryptoServiceProvider();
|
||||
byte[] cspBlob = rcsp.ExportCspBlob(true);
|
||||
byte[] cspBlobPub = rcsp.ExportCspBlob(false);
|
||||
FileStream outFile = File.Create("privateKey.blob");
|
||||
FileStream outFilePub = File.Create("publicKey.blob");
|
||||
FileStream outFile = File.Create(ServerPrivateKey);
|
||||
FileStream outFilePub = File.Create(ServerPublicKey);
|
||||
outFile.Write(cspBlob, 0, cspBlob.Length);
|
||||
outFile.Close();
|
||||
outFilePub.Write(cspBlobPub, 0, cspBlobPub.Length);
|
||||
|
||||
@ -14,8 +14,7 @@ namespace PSO2SERVER
|
||||
public enum QueryMode
|
||||
{
|
||||
ShipList,/*12100 - 12900*/
|
||||
Ship1,
|
||||
Ship2
|
||||
Block
|
||||
}
|
||||
|
||||
public class QueryServer
|
||||
@ -45,10 +44,7 @@ namespace PSO2SERVER
|
||||
default:
|
||||
c = DoShipList;
|
||||
break;
|
||||
case QueryMode.Ship1:
|
||||
c = DoBlockBalance;
|
||||
break;
|
||||
case QueryMode.Ship2:
|
||||
case QueryMode.Block:
|
||||
c = DoBlockBalance;
|
||||
break;
|
||||
case QueryMode.ShipList:
|
||||
|
||||
@ -29,8 +29,7 @@ namespace PSO2SERVER
|
||||
PingTimer.Elapsed += PingClients;
|
||||
PingTimer.Start();
|
||||
|
||||
new QueryServer(QueryMode.Ship1, 12100); // Ship 1
|
||||
new QueryServer(QueryMode.Ship2, 12200); // Ship 2
|
||||
new QueryServer(QueryMode.Block, 12200); // Block
|
||||
}
|
||||
|
||||
public void Run()
|
||||
|
||||
@ -35,8 +35,9 @@
|
||||
<entityFramework>
|
||||
<providers>
|
||||
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
|
||||
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
|
||||
</provider></providers>
|
||||
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
|
||||
</provider>
|
||||
</providers>
|
||||
</entityFramework>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<packages>
|
||||
<package id="BCrypt-Official" version="0.1.109" targetFramework="net40" />
|
||||
<package id="BouncyCastle.Cryptography" version="2.4.0" targetFramework="net48" />
|
||||
<package id="EntityFramework" version="6.4.4" targetFramework="net48" />
|
||||
<package id="EntityFramework" version="6.5.1" targetFramework="net48" />
|
||||
<package id="Google.Protobuf" version="3.28.0" targetFramework="net48" />
|
||||
<package id="K4os.Compression.LZ4" version="1.3.8" targetFramework="net48" />
|
||||
<package id="K4os.Compression.LZ4.Streams" version="1.3.8" targetFramework="net48" />
|
||||
|
||||
Loading…
Reference in New Issue
Block a user