This commit is contained in:
Rick Falkvinge
2021-02-13 20:57:27 +01:00
22 changed files with 347 additions and 216 deletions
+9 -11
View File
@@ -72,7 +72,7 @@ namespace Swarmops.Backend
if (!Debugger.IsAttached)
{
killSignals = new UnixSignal[] {new UnixSignal (Signum.SIGINT), new UnixSignal (Signum.SIGTERM)};
killSignals = new UnixSignal[] {new UnixSignal (Signum.SIGINT), new UnixSignal (Signum.SIGTERM), new UnixSignal(Signum.SIGABRT), new UnixSignal(Signum.SIGQUIT), new UnixSignal(Signum.SIGPWR), new UnixSignal(Signum.SIGHUP) };
}
BotLog.Write (0, "MainCycle", string.Empty);
@@ -223,10 +223,6 @@ namespace Swarmops.Backend
BotLog.Write(0, "MainCycle", "Backend STARTING");
// Disable certificate checking due to Mono not installing with a certificate repository - this is UTTERLY broken
SupportFunctions.DisableSslCertificateChecks(); // MONO BUG/MISFEATURE: Mono has no root certificates, so can't verify cert
// Tell sysop we're starting
OutboundComm.CreateNotification (null, NotificationResource.System_Startup_Backend);
@@ -336,11 +332,13 @@ namespace Swarmops.Backend
// Wait for a maximum of ten seconds (the difference between cycleStartTime and cycleEndTime)
const int cycleTimeMilliseconds = 500;
int iterationCount = 0;
DateTime utcNow = DateTime.UtcNow;
while (utcNow < cycleEndTime && !exitFlag)
{
int signalIndex = 250;
int signalIndex = cycleTimeMilliseconds;
// Handle important service orders (those that can't be lost in a random loss
// of connection of a socket):
@@ -348,14 +346,14 @@ namespace Swarmops.Backend
BackendServiceOrders backendOrders = BackendServiceOrders.GetNextBatch(5);
backendOrders.Execute(); // takes at most 250ms per BSO reqs
// Block until a SIGINT or SIGTERM signal is generated, or 1/4 second has passed.
// Block until a SIGINT or SIGTERM signal is generated, or 1/2 second has passed.
// However, we can't do that in a development environment - it won't have the
// Mono.Posix assembly, and won't understand UnixSignals. So people running this in
// a dev environment will need to stop it manually.
if (!Debugger.IsAttached)
{
signalIndex = UnixSignal.WaitAny(killSignals, 250);
signalIndex = UnixSignal.WaitAny(killSignals, cycleTimeMilliseconds);
}
else
{
@@ -365,10 +363,10 @@ namespace Swarmops.Backend
string.Format(CultureInfo.InvariantCulture,
"Waiting for {0:F2} more seconds for cycle end",
timeLeft.TotalMilliseconds/1000.0));
Thread.Sleep(250);
Thread.Sleep(cycleTimeMilliseconds);
}
if (signalIndex < 250)
if (signalIndex < cycleTimeMilliseconds)
{
exitFlag = true;
Console.WriteLine("Caught signal " + killSignals[signalIndex].Signum + ", exiting");
@@ -378,7 +376,7 @@ namespace Swarmops.Backend
utcNow = DateTime.UtcNow;
// Every second, send an internal heartbeat
// Every four loops, send an internal heartbeat
if (iterationCount++%4 == 0)
{
+16 -2
View File
@@ -23,9 +23,13 @@ namespace Swarmops.Backend
if (!comm.Resolved)
{
BotLog.Write(2, "CommsTx", "--resolving");
ICommsResolver resolver = null;
ICommsResolver resolver = FindResolver(comm);
resolver.Resolve(comm);
if (!String.IsNullOrWhiteSpace(comm.ResolverDataXml))
{
resolver = FindResolver(comm);
resolver.Resolve(comm);
}
comm.Resolved = true;
int recipientCount = comm.Recipients.Count;
@@ -136,8 +140,18 @@ namespace Swarmops.Backend
{
// Resolve recipients
if (comm.ResolverDataXml.Trim().Length < 1)
{
throw new InvalidOperationException("comm.ResolverDataXml is empty");
}
ResolverEnvelope resolverEnvelope = ResolverEnvelope.FromXml(comm.ResolverDataXml);
if (resolverEnvelope.ResolverDataXml.Trim().Length < 1)
{
throw new InvalidOperationException("resolverEnvelope.ResolverDataXml is empty with envelope type " + resolverEnvelope.GetType().ToString() + " and envelope XML " + comm.ResolverDataXml);
}
// Create the resolver via reflection of the static FromXml method
Assembly assembly = typeof(ResolverEnvelope).Assembly;
+14 -6
View File
@@ -1,15 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0"/>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0"/>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
+2 -84
View File
@@ -87,7 +87,7 @@ namespace Swarmops.Database
{
return "server=" + credentials.ServerSet.ServerPriorities[0].Split (';')[0] + ";database=" +
credentials.Database +
";user=" + credentials.Username + ";password=" + credentials.Password;
";uid=" + credentials.Username + ";pwd=" + credentials.Password + ";SslMode=Preferred;";
}
@@ -100,89 +100,7 @@ namespace Swarmops.Database
[Obsolete ("Do not use. Use GetDatabaseForAdmin().", true)]
public static SwarmDb GetDatabaseAsAdmin()
{
string connectionString = string.Empty;
try
{
if (Path.DirectorySeparatorChar == '/' && HttpContext.Current == null)
{
// We are running under mono in a backend environment
using (StreamReader reader = new StreamReader (MonoConfigFile.Replace (".config", "-admin.config")))
{
connectionString = reader.ReadLine();
Logging.LogInformation (LogSource.PirateDb,
"SwarmDb initialized for Linux Backend: [" + connectionString + "]");
}
}
else if (HttpContext.Current != null)
{
// We are running a web application, under Mono (production) or Windows (development)
using (
StreamReader reader =
new StreamReader (
HttpContext.Current.Server.MapPath (WebConfigFile.Replace (".config", "-admin.config")))
)
{
connectionString = reader.ReadLine();
Logging.LogInformation (LogSource.PirateDb,
"SwarmDb initialized for web: [" + connectionString + "]");
}
}
else
{
// We are running an application, presumably directly from Visual Studio.
// If so, the current working directory is "PirateWeb/30/Console/bin".
using (StreamReader reader = new StreamReader (AppConfigFile.Replace (".config", "-admin.config")))
{
connectionString = reader.ReadLine();
Logging.LogInformation (LogSource.PirateDb,
"SwarmDb initialized for application: [" + connectionString +
"]");
}
}
}
catch (Exception)
{
Logging.LogWarning (LogSource.PirateDb, "Unable to read Database.Config - defaulting");
// Ignore if we can't read the Database.config
}
// To simplify future checks
if (connectionString != null && connectionString.Length == 0)
{
connectionString = null;
}
// If we still have nothing, and we're running from web, then assume we have a dev environment and use the hostname as db, user, and pass.
if (String.IsNullOrEmpty (connectionString))
{
if (HttpContext.Current != null) // dummy comment to force build, remove on sight
{
string hostName = HttpContext.Current.Request.Url.Host;
connectionString = "server=peregrine;database=" + hostName + ";user=" + hostName +
"-admin;password=" + hostName + "-admin";
// TODO: Replace "peregrine" with "localhost"
}
else
{
throw new InvalidOperationException (
"No database-as-admin connection string found -- write a connect string into the \"ActivizrAdminConnect\" environment var, or on one line into a file named database-admin.config; see connectionstrings.com for examples");
// TODO: Replace with custom exception to present config screen
}
}
// Now write the correct data to the cache, for faster lookup next time
if (_cachedConnectionString == null)
{
_cachedConnectionString = connectionString;
}
return new SwarmDb (DbProviderFactories.GetFactory (DefaultProviderName), connectionString);
throw new InvalidOperationException();
}
}
}
+55 -2
View File
@@ -47,17 +47,70 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
<HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Google.Protobuf, Version=3.11.4.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Protobuf.3.11.4\lib\net45\Google.Protobuf.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="K4os.Compression.LZ4, Version=1.1.11.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
<HintPath>..\packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="K4os.Compression.LZ4.Streams, Version=1.1.11.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
<HintPath>..\packages\K4os.Compression.LZ4.Streams.1.1.11\lib\net46\K4os.Compression.LZ4.Streams.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="K4os.Hash.xxHash, Version=1.0.6.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
<HintPath>..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=8.0.23.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.23\lib\net452\MySql.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Renci.SshNet, Version=2020.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>..\packages\SSH.NET.2020.0.0\lib\net40\Renci.SshNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.ComponentModel" />
<Reference Include="System.Configuration.Install" />
<Reference Include="System.Data" />
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.23\lib\net452\Ubiety.Dns.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.23\lib\net452\Zstandard.Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Configuration.cs" />
+13 -6
View File
@@ -18,9 +18,16 @@
</setting>
</Activizr.Database.DatabaseConnect>
</applicationSettings>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data></configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
+11 -1
View File
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MySql.Data" version="6.9.9" targetFramework="net461" />
<package id="BouncyCastle" version="1.8.5" targetFramework="net461" />
<package id="Google.Protobuf" version="3.11.4" targetFramework="net461" />
<package id="K4os.Compression.LZ4" version="1.1.11" targetFramework="net461" />
<package id="K4os.Compression.LZ4.Streams" version="1.1.11" targetFramework="net461" />
<package id="K4os.Hash.xxHash" version="1.0.6" targetFramework="net461" />
<package id="MySql.Data" version="8.0.23" targetFramework="net461" />
<package id="SSH.NET" version="2020.0.0" targetFramework="net461" />
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
</packages>
+14 -2
View File
@@ -1,6 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
+14 -2
View File
@@ -1,6 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
+6 -5
View File
@@ -60,7 +60,7 @@ namespace Swarmops.Frontend.Socket
if (!Debugger.IsAttached)
{
killSignals = new UnixSignal[] {new UnixSignal(Signum.SIGINT), new UnixSignal(Signum.SIGTERM)};
killSignals = new UnixSignal[] { new UnixSignal(Signum.SIGINT), new UnixSignal(Signum.SIGTERM), new UnixSignal(Signum.SIGABRT), new UnixSignal(Signum.SIGQUIT), new UnixSignal(Signum.SIGPWR), new UnixSignal(Signum.SIGHUP) };
}
Console.WriteLine(" * Swarmops Frontend Socket Server starting up.");
@@ -162,13 +162,14 @@ namespace Swarmops.Frontend.Socket
lastSecond = cycleStartTime.Second;
lastMinute = cycleStartTime.Minute;
lastHour = cycleStartTime.Hour;
const int cycleIntervalMilliseconds = 500;
// Wait for a maximum of ten seconds (the difference between cycleStartTime and cycleEndTime)
DateTime utcNow = DateTime.UtcNow;
while (utcNow < cycleEndTime && !exitFlag)
{
int signalIndex = 250;
int signalIndex = cycleIntervalMilliseconds;
// Block until a SIGINT or SIGTERM signal is generated, or 1/4 second has passed.
// However, we can't do that in a development environment - it won't have the
@@ -177,14 +178,14 @@ namespace Swarmops.Frontend.Socket
if (!Debugger.IsAttached)
{
signalIndex = UnixSignal.WaitAny(killSignals, 250);
signalIndex = UnixSignal.WaitAny(killSignals, cycleIntervalMilliseconds);
}
else
{
Thread.Sleep(250);
Thread.Sleep(cycleIntervalMilliseconds);
}
if (signalIndex < 250)
if (signalIndex < cycleIntervalMilliseconds)
{
exitFlag = true;
Console.WriteLine(" * Swarmops Frontend Socket Server caught signal " +
+14 -6
View File
@@ -1,15 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0"/>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0"/>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+11 -2
View File
@@ -78,11 +78,12 @@
<HintPath>..\packages\Markdig.0.10.3\lib\net40\Markdig.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Mono.Posix">
<HintPath>..\External Libraries\Mono.Posix.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=8.0.23.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.23\lib\net452\MySql.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NBitcoinBCC, Version=1.0.16.0, Culture=neutral, processorArchitecture=MSIL">
@@ -118,10 +119,18 @@
<Reference Include="System.Web.Services" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.23\lib\net452\Ubiety.Dns.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="websocket-sharp, Version=1.0.2.59611, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
<HintPath>..\packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.23\lib\net452\Zstandard.Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Communications\IHasGeography.cs" />
+5
View File
@@ -37,6 +37,11 @@ namespace Swarmops.Logic.Support
xml = xml.Replace ("&#x0;", "");
xml = xml.Replace ("\x00", "");
if (String.IsNullOrWhiteSpace(xml))
{
throw new ArgumentException("xml is empty"); // Catch a weird empty-XML error and try to get a stack trace
}
XmlSerializer serializer = new XmlSerializer (typeof (T));
MemoryStream stream = new MemoryStream();
+14 -11
View File
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0"/>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0"/>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient"/>
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
</DbProviderFactories>
</system.data><startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
-1
View File
@@ -6,7 +6,6 @@
<package id="iTextSharp-LGPL" version="4.1.6" targetFramework="net45" />
<package id="Markdig" version="0.10.3" targetFramework="net45" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
<package id="MySql.Data" version="6.9.9" targetFramework="net45" />
<package id="NBitcoinBCC" version="1.0.16" targetFramework="net45" requireReinstallation="true" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+7 -4
View File
@@ -1,9 +1,12 @@
Swarmops
SOFTWARE BEING REVISED
======================
**This repo is undergoing changes to resume development.** The information below is legacy and subject to change as this software clarifies its direction.
Swarmops
========
**This repo is undergoing changes to resume development.**
**Swarmops is a necessary tool to enable any bitcoin-native or decentralized gamechanger.**
Swarmops is an admin system for swarm-type organizations. It's a bureaucracy system for people who thoroughly dislike bureaucracy, so it removes all visibility of it and focuses on the ops aspects. It manages decentralized authority, volunteers, members, activists, budgets, mass communications, expenses, payroll, invoices, and complete financials/bookkeeping.
+16
View File
@@ -0,0 +1,16 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EmptyPage.aspx.cs" Inherits="Swarmops.Frontend.Pages.v5.Admin.Hacks.EmptyPage" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
This is an empty page to check for sharing violations.
</div>
</form>
</body>
</html>
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace Swarmops.Frontend.Pages.v5.Admin.Hacks
{
public partial class EmptyPage : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Swarmops.Frontend.Pages.v5.Admin.Hacks
{
public partial class EmptyPage
{
/// <summary>
/// form1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}
+55 -59
View File
@@ -1,114 +1,110 @@
<?xml version="1.0"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=169433
<?xml version="1.0" encoding="utf-8"?>
-->
<configuration>
<!--
For a description of web.config changes for .NET 4.5 see http://go.microsoft.com/fwlink/?LinkId=235367.
The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.5" />
</system.Web>
-->
<system.web>
<machineKey configSource="machineKey.config"/>
<machineKey configSource="machineKey.config" />
<compilation debug="true" batch="false" targetFramework="4.6.1">
<assemblies>
<!-- <add assembly="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" /> -->
<!-- <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -->
<add assembly="System.ComponentModel.Composition, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add assembly="System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add assembly="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add assembly="System.ComponentModel.Composition, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.IO.Compression, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Numerics, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</assemblies>
</compilation>
<customErrors mode="Off"/>
<httpRuntime maxRequestLength="40960" executionTimeout="180" targetFramework="4.5"/>
<customErrors mode="Off" />
<httpRuntime maxRequestLength="40960" executionTimeout="180" targetFramework="4.6.1" />
<authentication mode="Forms">
<forms loginUrl="~/Security/Login" name=".SwarmopsAuth" path="/" protection="All" timeout="10080" slidingExpiration="true" defaultUrl="/" cookieless="UseDeviceProfile"/>
<forms loginUrl="~/Security/Login" name=".SwarmopsAuth" path="/" protection="All" timeout="10080" slidingExpiration="true" defaultUrl="/" cookieless="UseDeviceProfile" />
</authentication>
<authorization>
<deny users="?"/>
<deny users="?" />
</authorization>
<pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID">
<pages clientIDMode="AutoID">
<controls>
<add tagPrefix="Swarmops5" tagName="AjaxComboPeople" src="~/Controls/v5/Swarm/ComboPeople.ascx"/>
<add tagPrefix="Swarmops5" tagName="AjaxTextBox" src="~/Controls/v5/Base/AjaxTextBox.ascx"/>
<add tagPrefix="Swarmops5" tagName="AjaxDropDown" src="~/Controls/v5/Base/AjaxDropDown.ascx"/>
<add tagPrefix="Swarmops5" tagName="AjaxToggleSlider" src="~/Controls/v5/Base/AjaxToggleSlider.ascx"/>
<add tagPrefix="Swarmops5" tagName="ComboBudgets" src="~/Controls/v5/Financial/ComboBudgets.ascx"/>
<add tagPrefix="Swarmops5" tagName="ComboPeople" src="~/Controls/v5/Swarm/ComboPeople.ascx"/>
<add tagPrefix="Swarmops5" tagName="DropDown" src="~/Controls/v5/Base/DropDown.ascx"/>
<add tagPrefix="Swarmops5" tagName="ExternalScripts" src="~/Controls/v5/Meta/ExternalScripts.ascx"/>
<add tagPrefix="Swarmops5" tagName="FileUpload" src="~/Controls/v5/Base/FileUpload.ascx"/>
<add tagPrefix="Swarmops5" tagName="ImpersonationWarningBox" src="~/Controls/v5/Swarm/ImpersonationWarningBox.ascx"/>
<add tagPrefix="Swarmops5" tagName="IncludedScripts" src="~/Controls/v5/Meta/IncludedScripts.ascx"/>
<add tagPrefix="Swarmops5" tagName="ModalDialog" src="~/Controls/v5/Base/ModalDialog.ascx"/>
<add tagPrefix="Swarmops5" tagName="MainMenu" src="~/Controls/v5/Base/MainMenu.ascx"/>
<add tagPrefix="Swarmops5" tagName="TextCurrency" src="~/Controls/v5/Financial/CurrencyTextBox.ascx"/>
<add tagPrefix="Swarmops5" tagName="TreePositions" src="~/Controls/v5/Swarm/TreePositions.ascx"/>
<add tagPrefix="Swarmops5" tagName="ProgressBar" src="~/Controls/v5/Base/ProgressBar.ascx"/>
<add tagPrefix="Swarmops5" tagName="ProgressBarFake" src="~/Controls/v5/Base/ProgressBarFake.ascx"/>
<add tagPrefix="Swarmops5" tagName="DocumentDownloader" src="~/Controls/v5/Base/DocumentDownloader.ascx"/>
<add tagPrefix="Swarmops5" tagName="AjaxComboPeople" src="~/Controls/v5/Swarm/ComboPeople.ascx" />
<add tagPrefix="Swarmops5" tagName="AjaxTextBox" src="~/Controls/v5/Base/AjaxTextBox.ascx" />
<add tagPrefix="Swarmops5" tagName="AjaxDropDown" src="~/Controls/v5/Base/AjaxDropDown.ascx" />
<add tagPrefix="Swarmops5" tagName="AjaxToggleSlider" src="~/Controls/v5/Base/AjaxToggleSlider.ascx" />
<add tagPrefix="Swarmops5" tagName="ComboBudgets" src="~/Controls/v5/Financial/ComboBudgets.ascx" />
<add tagPrefix="Swarmops5" tagName="ComboPeople" src="~/Controls/v5/Swarm/ComboPeople.ascx" />
<add tagPrefix="Swarmops5" tagName="DropDown" src="~/Controls/v5/Base/DropDown.ascx" />
<add tagPrefix="Swarmops5" tagName="ExternalScripts" src="~/Controls/v5/Meta/ExternalScripts.ascx" />
<add tagPrefix="Swarmops5" tagName="FileUpload" src="~/Controls/v5/Base/FileUpload.ascx" />
<add tagPrefix="Swarmops5" tagName="ImpersonationWarningBox" src="~/Controls/v5/Swarm/ImpersonationWarningBox.ascx" />
<add tagPrefix="Swarmops5" tagName="IncludedScripts" src="~/Controls/v5/Meta/IncludedScripts.ascx" />
<add tagPrefix="Swarmops5" tagName="ModalDialog" src="~/Controls/v5/Base/ModalDialog.ascx" />
<add tagPrefix="Swarmops5" tagName="MainMenu" src="~/Controls/v5/Base/MainMenu.ascx" />
<add tagPrefix="Swarmops5" tagName="TextCurrency" src="~/Controls/v5/Financial/CurrencyTextBox.ascx" />
<add tagPrefix="Swarmops5" tagName="TreePositions" src="~/Controls/v5/Swarm/TreePositions.ascx" />
<add tagPrefix="Swarmops5" tagName="ProgressBar" src="~/Controls/v5/Base/ProgressBar.ascx" />
<add tagPrefix="Swarmops5" tagName="ProgressBarFake" src="~/Controls/v5/Base/ProgressBarFake.ascx" />
<add tagPrefix="Swarmops5" tagName="DocumentDownloader" src="~/Controls/v5/Base/DocumentDownloader.ascx" />
</controls>
</pages>
</system.web>
<system.web.extensions>
<scripting>
<webServices>
<jsonSerialization maxJsonLength="50000000"/>
<jsonSerialization maxJsonLength="50000000" />
</webServices>
</scripting>
</system.web.extensions>
<system.data>
<DbProviderFactories>
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral"/>
</DbProviderFactories>
<!--<DbProviderFactories>
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral" />
</DbProviderFactories>-->
</system.data>
<appSettings>
<add key="aspnet:UseLegacyEncryption" value="false"/>
<add key="aspnet:UseLegacyMachineKeyEncryption" value="false"/>
<add key="aspnet:UseLegacyFormsAuthenticationTicketCompatibility" value="false"/>
<add key="MonoServerDefaultIndexFiles" value="/"/>
<add key="aspnet:UseLegacyEncryption" value="false" />
<add key="aspnet:UseLegacyMachineKeyEncryption" value="false" />
<add key="aspnet:UseLegacyFormsAuthenticationTicketCompatibility" value="false" />
<add key="MonoServerDefaultIndexFiles" value="/" />
</appSettings>
<system.webServer>
<modules runAllManagedModulesForAllRequests="true"/>
<modules runAllManagedModulesForAllRequests="true" />
<handlers>
<remove name="ChartImage_axd"/>
<remove name="ChartImage_axd" />
</handlers>
<security>
<requestFiltering>
<requestLimits maxAllowedContentLength="41943040"/>
<requestLimits maxAllowedContentLength="41943040" />
</requestFiltering>
</security>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0"/>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="6.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
<codeBase version="6.0.0.0" href="bin\Newtonsoft.Json.6.0.0.dll"/>
<codeBase version="9.0.0.0" href="bin\Newtonsoft.Json.dll"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="6.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<codeBase version="6.0.0.0" href="bin\Newtonsoft.Json.6.0.0.dll" />
<codeBase version="9.0.0.0" href="bin\Newtonsoft.Json.dll" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<location path="WebResource.axd">
<system.web>
<authorization>
<allow users="*"/>
<allow users="*" />
</authorization>
</system.web>
</location>
<location path="ScriptResource.axd">
<system.web>
<authorization>
<allow users="*"/>
<allow users="*" />
</authorization>
</system.web>
</location>
+14 -6
View File
@@ -1,15 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0"/>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0"/>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+14 -6
View File
@@ -1,15 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0"/>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.5.9.0" newVersion="4.5.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0"/>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>