1
0
mirror of https://git.teknik.io/Teknikode/Teknik.git synced 2023-08-02 14:16:22 +02:00

Added git repo checking to user cleaning.

Fixed user object not being correct for deletion.
This commit is contained in:
Uncled1023 2016-05-17 23:47:05 -07:00
parent a8e68d9b24
commit 596d1ac0ed

View File

@ -106,6 +106,10 @@ namespace ServerMaint
Output(string.Format("[{0}] Started Virus Scan.", DateTime.Now)); Output(string.Format("[{0}] Started Virus Scan.", DateTime.Now));
List<Upload> uploads = db.Uploads.ToList(); List<Upload> uploads = db.Uploads.ToList();
// Initialize ClamAV
ClamClient clam = new ClamClient(config.UploadConfig.ClamServer, config.UploadConfig.ClamPort);
clam.MaxStreamSize = config.UploadConfig.MaxUploadSize;
int totalCount = uploads.Count(); int totalCount = uploads.Count();
int totalScans = 0; int totalScans = 0;
int totalClean = 0; int totalClean = 0;
@ -127,8 +131,6 @@ namespace ServerMaint
} }
// We have the data, let's scan it // We have the data, let's scan it
ClamClient clam = new ClamClient(config.UploadConfig.ClamServer, config.UploadConfig.ClamPort);
clam.MaxStreamSize = config.UploadConfig.MaxUploadSize;
ClamScanResult scanResult = clam.SendAndScanFile(data); ClamScanResult scanResult = clam.SendAndScanFile(data);
switch (scanResult.Result) switch (scanResult.Result)
@ -240,13 +242,21 @@ namespace ServerMaint
// Any git repos? // Any git repos?
if (config.GitConfig.Enabled) if (config.GitConfig.Enabled)
{ {
string email = UserHelper.GetUserEmailAddress(config, user.Username);
// We need to check the actual git database
MysqlDatabase mySQL = new MysqlDatabase(config.GitConfig.Database);
string sql = @"SELECT * FROM gogs.repository
LEFT JOIN gogs.action ON gogs.user.id = gogs.action.act_user_id
WHERE gogs.user.login_name = {0}";
var results = mySQL.Query(sql, new object[] { email });
noData &= !(results != null && results.Any());
} }
if (noData) if (noData)
{ {
// They have no data, so safe to delete them. // They have no data, so safe to delete them.
UserHelper.DeleteUser(db, config, user); UserHelper.DeleteUser(db, config, UserHelper.GetUser(db, user.Username));
totalUsers++; totalUsers++;
} }
continue; continue;