Skip to content

Commit cd9d006

Browse files
s3inlcs3inlc
committed
made style and order consistent in files
1 parent 68a918a commit cd9d006

File tree

2 files changed

+171
-132
lines changed

2 files changed

+171
-132
lines changed

‎src/migrations/mysql/20251127000000_initial.sql‎

Lines changed: 95 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
22
SET time_zone = "+00:00";
33

4-
54
/*!40101 SET @OLD_CHARACTER_SET_CLIENT = @@CHARACTER_SET_CLIENT */;
65
/*!40101 SET @OLD_CHARACTER_SET_RESULTS = @@CHARACTER_SET_RESULTS */;
76
/*!40101 SET @OLD_COLLATION_CONNECTION = @@COLLATION_CONNECTION */;
@@ -46,7 +45,7 @@ CREATE TABLE IF NOT EXISTS `Agent` (
4645

4746
CREATE TABLE IF NOT EXISTS `AgentBinary` (
4847
`agentBinaryId` INT(11) NOT NULL,
49-
`binaryType` VARCHAR(20) NOT NULL,
48+
`binaryType` VARCHAR(20) NOT NULL,
5049
`version` VARCHAR(20) NOT NULL,
5150
`operatingSystems` VARCHAR(50) NOT NULL,
5251
`filename` VARCHAR(50) NOT NULL,
@@ -67,10 +66,10 @@ CREATE TABLE IF NOT EXISTS `AgentError` (
6766
) ENGINE = InnoDB;
6867

6968
CREATE TABLE IF NOT EXISTS `AgentStat` (
70-
`agentStatId` INT(11) NOT NULL,
71-
`agentId` INT(11) NOT NULL,
72-
`statType` INT(11) NOT NULL,
73-
`time` BIGINT NOT NULL,
69+
`agentStatId` INT(11) NOT NULL,
70+
`agentId` INT(11) NOT NULL,
71+
`statType` INT(11) NOT NULL,
72+
`time` BIGINT NOT NULL,
7473
`value` VARCHAR(128) NOT NULL
7574
) ENGINE = InnoDB;
7675

@@ -80,6 +79,25 @@ CREATE TABLE IF NOT EXISTS `AgentZap` (
8079
`lastZapId` INT(11) NULL
8180
) ENGINE = InnoDB;
8281

82+
CREATE TABLE IF NOT EXISTS `ApiKey` (
83+
`apiKeyId` INT(11) NOT NULL,
84+
`startValid` BIGINT(20) NOT NULL,
85+
`endValid` BIGINT(20) NOT NULL,
86+
`accessKey` VARCHAR(256) NOT NULL,
87+
`accessCount` INT(11) NOT NULL,
88+
`userId` INT(11) NOT NULL,
89+
`apiGroupId` INT(11) NOT NULL
90+
) ENGINE=InnoDB;
91+
92+
CREATE TABLE IF NOT EXISTS `ApiGroup` (
93+
`apiGroupId` INT(11) NOT NULL,
94+
`name` VARCHAR(100) NOT NULL,
95+
`permissions` TEXT NOT NULL
96+
) ENGINE=InnoDB;
97+
98+
INSERT INTO `ApiGroup` ( `apiGroupId`, `name`, `permissions`) VALUES
99+
(1, 'Administrators', 'ALL');
100+
83101
CREATE TABLE IF NOT EXISTS `Assignment` (
84102
`assignmentId` INT(11) NOT NULL,
85103
`taskId` INT(11) NOT NULL,
@@ -174,7 +192,6 @@ INSERT INTO `Config` (`configId`, `configSectionId`, `item`, `value`) VALUES
174192
(78, 3, 'defaultPageSize', '10000'),
175193
(79, 3, 'maxPageSize', '50000');
176194

177-
178195
CREATE TABLE IF NOT EXISTS `ConfigSection` (
179196
`configSectionId` INT(11) NOT NULL,
180197
`sectionName` VARCHAR(100) NOT NULL
@@ -219,6 +236,13 @@ CREATE TABLE IF NOT EXISTS `File` (
219236
`lineCount` BIGINT(20) DEFAULT NULL
220237
) ENGINE = InnoDB;
221238

239+
CREATE TABLE IF NOT EXISTS `FileDownload` (
240+
`fileDownloadId` INT(11) NOT NULL,
241+
`time` BIGINT NOT NULL,
242+
`fileId` INT(11) NOT NULL,
243+
`status` INT(11) NOT NULL
244+
) ENGINE=InnoDB;
245+
222246
CREATE TABLE IF NOT EXISTS `FilePretask` (
223247
`filePretaskId` INT(11) NOT NULL,
224248
`fileId` INT(11) NOT NULL,
@@ -253,7 +277,7 @@ CREATE TABLE IF NOT EXISTS `HashBinary` (
253277
`hashBinaryId` INT(11) NOT NULL,
254278
`hashlistId` INT(11) NOT NULL,
255279
`essid` VARCHAR(100) NOT NULL,
256-
`hash` LONGTEXT NOT NULL,
280+
`hash` LONGTEXT NOT NULL,
257281
`plaintext` VARCHAR(1024) DEFAULT NULL,
258282
`timeCracked` BIGINT DEFAULT NULL,
259283
`chunkId` INT(11) DEFAULT NULL,
@@ -874,6 +898,48 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V
874898
(73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1),
875899
(99999, 'Plaintext', 0, 0);
876900

901+
CREATE TABLE IF NOT EXISTS `HealthCheck` (
902+
`healthCheckId` INT(11) NOT NULL,
903+
`time` BIGINT(20) NOT NULL,
904+
`status` INT(11) NOT NULL,
905+
`checkType` INT(11) NOT NULL,
906+
`hashtypeId` INT(11) NOT NULL,
907+
`crackerBinaryId` INT(11) NOT NULL,
908+
`expectedCracks` INT(11) NOT NULL,
909+
`attackCmd` TEXT NOT NULL
910+
) ENGINE=InnoDB;
911+
912+
CREATE TABLE IF NOT EXISTS `HealthCheckAgent` (
913+
`healthCheckAgentId` INT(11) NOT NULL,
914+
`healthCheckId` INT(11) NOT NULL,
915+
`agentId` INT(11) NOT NULL,
916+
`status` INT(11) NOT NULL,
917+
`cracked` INT(11) NOT NULL,
918+
`numGpus` INT(11) NOT NULL,
919+
`start` BIGINT(20) NOT NULL,
920+
`htp_end` BIGINT(20) NOT NULL,
921+
`errors` TEXT NOT NULL
922+
) ENGINE=InnoDB;
923+
924+
CREATE TABLE IF NOT EXISTS `htp_User` (
925+
`userId` INT(11) NOT NULL,
926+
`username` VARCHAR(100) NOT NULL,
927+
`email` VARCHAR(150) NOT NULL,
928+
`passwordHash` VARCHAR(256) NOT NULL,
929+
`passwordSalt` VARCHAR(256) NOT NULL,
930+
`isValid` TINYINT(4) NOT NULL,
931+
`isComputedPassword` TINYINT(4) NOT NULL,
932+
`lastLoginDate` BIGINT NOT NULL,
933+
`registeredSince` BIGINT NOT NULL,
934+
`sessionLifetime` INT(11) NOT NULL,
935+
`rightGroupId` INT(11) NOT NULL,
936+
`yubikey` VARCHAR(256) DEFAULT NULL,
937+
`otp1` VARCHAR(256) DEFAULT NULL,
938+
`otp2` VARCHAR(256) DEFAULT NULL,
939+
`otp3` VARCHAR(256) DEFAULT NULL,
940+
`otp4` VARCHAR(256) DEFAULT NULL
941+
) ENGINE = InnoDB;
942+
877943
CREATE TABLE IF NOT EXISTS `LogEntry` (
878944
`logEntryId` INT(11) NOT NULL,
879945
`issuer` VARCHAR(50) NOT NULL,
@@ -893,6 +959,16 @@ CREATE TABLE IF NOT EXISTS `NotificationSetting` (
893959
`isActive` TINYINT(4) NOT NULL
894960
)ENGINE = InnoDB;
895961

962+
CREATE TABLE IF NOT EXISTS `Preprocessor` (
963+
`preprocessorId` INT(11) NOT NULL,
964+
`name` VARCHAR(256) NOT NULL,
965+
`url` VARCHAR(512) NOT NULL,
966+
`binaryName` VARCHAR(256) NOT NULL,
967+
`keyspaceCommand` VARCHAR(256) NULL,
968+
`skipCommand` VARCHAR(256) NULL,
969+
`limitCommand` VARCHAR(256) NULL
970+
) ENGINE=InnoDB;
971+
896972
CREATE TABLE IF NOT EXISTS `Pretask` (
897973
`pretaskId` INT(11) NOT NULL,
898974
`taskName` VARCHAR(100) NOT NULL,
@@ -1003,25 +1079,6 @@ CREATE TABLE IF NOT EXISTS `TaskWrapper` (
10031079
`cracked` INT(11) NOT NULL
10041080
)ENGINE = InnoDB;
10051081

1006-
CREATE TABLE IF NOT EXISTS `htp_User` (
1007-
`userId` INT(11) NOT NULL,
1008-
`username` VARCHAR(100) NOT NULL,
1009-
`email` VARCHAR(150) NOT NULL,
1010-
`passwordHash` VARCHAR(256) NOT NULL,
1011-
`passwordSalt` VARCHAR(256) NOT NULL,
1012-
`isValid` TINYINT(4) NOT NULL,
1013-
`isComputedPassword` TINYINT(4) NOT NULL,
1014-
`lastLoginDate` BIGINT NOT NULL,
1015-
`registeredSince` BIGINT NOT NULL,
1016-
`sessionLifetime` INT(11) NOT NULL,
1017-
`rightGroupId` INT(11) NOT NULL,
1018-
`yubikey` VARCHAR(256) DEFAULT NULL,
1019-
`otp1` VARCHAR(256) DEFAULT NULL,
1020-
`otp2` VARCHAR(256) DEFAULT NULL,
1021-
`otp3` VARCHAR(256) DEFAULT NULL,
1022-
`otp4` VARCHAR(256) DEFAULT NULL
1023-
) ENGINE = InnoDB;
1024-
10251082
CREATE TABLE IF NOT EXISTS `Zap` (
10261083
`zapId` INT(11) NOT NULL,
10271084
`hash` MEDIUMTEXT NOT NULL,
@@ -1030,65 +1087,6 @@ CREATE TABLE IF NOT EXISTS `Zap` (
10301087
`hashlistId` INT(11) NOT NULL
10311088
) ENGINE = InnoDB;
10321089

1033-
CREATE TABLE IF NOT EXISTS `ApiKey` (
1034-
`apiKeyId` INT(11) NOT NULL,
1035-
`startValid` BIGINT(20) NOT NULL,
1036-
`endValid` BIGINT(20) NOT NULL,
1037-
`accessKey` VARCHAR(256) NOT NULL,
1038-
`accessCount` INT(11) NOT NULL,
1039-
`userId` INT(11) NOT NULL,
1040-
`apiGroupId` INT(11) NOT NULL
1041-
) ENGINE=InnoDB;
1042-
1043-
CREATE TABLE IF NOT EXISTS `ApiGroup` (
1044-
`apiGroupId` INT(11) NOT NULL,
1045-
`name` VARCHAR(100) NOT NULL,
1046-
`permissions` TEXT NOT NULL
1047-
) ENGINE=InnoDB;
1048-
1049-
CREATE TABLE IF NOT EXISTS `FileDownload` (
1050-
`fileDownloadId` INT(11) NOT NULL,
1051-
`time` BIGINT NOT NULL,
1052-
`fileId` INT(11) NOT NULL,
1053-
`status` INT(11) NOT NULL
1054-
) ENGINE=InnoDB;
1055-
1056-
INSERT INTO `ApiGroup` ( `apiGroupId`, `name`, `permissions`) VALUES
1057-
(1, 'Administrators', 'ALL');
1058-
1059-
CREATE TABLE IF NOT EXISTS `HealthCheck` (
1060-
`healthCheckId` INT(11) NOT NULL,
1061-
`time` BIGINT(20) NOT NULL,
1062-
`status` INT(11) NOT NULL,
1063-
`checkType` INT(11) NOT NULL,
1064-
`hashtypeId` INT(11) NOT NULL,
1065-
`crackerBinaryId` INT(11) NOT NULL,
1066-
`expectedCracks` INT(11) NOT NULL,
1067-
`attackCmd` TEXT NOT NULL
1068-
) ENGINE=InnoDB;
1069-
1070-
CREATE TABLE IF NOT EXISTS `HealthCheckAgent` (
1071-
`healthCheckAgentId` INT(11) NOT NULL,
1072-
`healthCheckId` INT(11) NOT NULL,
1073-
`agentId` INT(11) NOT NULL,
1074-
`status` INT(11) NOT NULL,
1075-
`cracked` INT(11) NOT NULL,
1076-
`numGpus` INT(11) NOT NULL,
1077-
`start` BIGINT(20) NOT NULL,
1078-
`htp_end` BIGINT(20) NOT NULL,
1079-
`errors` TEXT NOT NULL
1080-
) ENGINE=InnoDB;
1081-
1082-
CREATE TABLE IF NOT EXISTS `Preprocessor` (
1083-
`preprocessorId` INT(11) NOT NULL,
1084-
`name` VARCHAR(256) NOT NULL,
1085-
`url` VARCHAR(512) NOT NULL,
1086-
`binaryName` VARCHAR(256) NOT NULL,
1087-
`keyspaceCommand` VARCHAR(256) NULL,
1088-
`skipCommand` VARCHAR(256) NULL,
1089-
`limitCommand` VARCHAR(256) NULL
1090-
) ENGINE=InnoDB;
1091-
10921090
INSERT INTO `Preprocessor` ( `preprocessorId`, `name`, `url`, `binaryName`, `keyspaceCommand`, `skipCommand`, `limitCommand`) VALUES
10931091
(1, 'Prince', 'https://github.com/hashcat/princeprocessor/releases/download/v0.22/princeprocessor-0.22.7z', 'pp', '--keyspace', '--skip', '--limit');
10941092

@@ -1209,6 +1207,11 @@ ALTER TABLE `HealthCheck`
12091207
ALTER TABLE `HealthCheckAgent`
12101208
ADD PRIMARY KEY (`healthCheckAgentId`);
12111209

1210+
ALTER TABLE `htp_User`
1211+
ADD PRIMARY KEY (`userId`),
1212+
ADD UNIQUE KEY `username` (`username`),
1213+
ADD KEY `rightGroupId` (`rightGroupId`);
1214+
12121215
ALTER TABLE `LogEntry`
12131216
ADD PRIMARY KEY (`logEntryId`);
12141217

@@ -1259,11 +1262,6 @@ ALTER TABLE `TaskWrapper`
12591262
ADD KEY `isArchived` (`isArchived`),
12601263
ADD KEY `accessGroupId` (`accessGroupId`);
12611264

1262-
ALTER TABLE `htp_User`
1263-
ADD PRIMARY KEY (`userId`),
1264-
ADD UNIQUE KEY `username` (`username`),
1265-
ADD KEY `rightGroupId` (`rightGroupId`);
1266-
12671265
ALTER TABLE `Zap`
12681266
ADD PRIMARY KEY (`zapId`),
12691267
ADD KEY `agentId` (`agentId`),
@@ -1359,6 +1357,9 @@ ALTER TABLE `HealthCheck`
13591357
ALTER TABLE `HealthCheckAgent`
13601358
MODIFY `healthCheckAgentId` INT(11) NOT NULL AUTO_INCREMENT;
13611359

1360+
ALTER TABLE `htp_User`
1361+
MODIFY `userId` INT(11) NOT NULL AUTO_INCREMENT;
1362+
13621363
ALTER TABLE `LogEntry`
13631364
MODIFY `logEntryId` INT(11) NOT NULL AUTO_INCREMENT;
13641365

@@ -1396,9 +1397,6 @@ ALTER TABLE `TaskDebugOutput`
13961397
ALTER TABLE `TaskWrapper`
13971398
MODIFY `taskWrapperId` INT(11) NOT NULL AUTO_INCREMENT;
13981399

1399-
ALTER TABLE `htp_User`
1400-
MODIFY `userId` INT(11) NOT NULL AUTO_INCREMENT;
1401-
14021400
ALTER TABLE `Zap`
14031401
MODIFY `zapId` INT(11) NOT NULL AUTO_INCREMENT;
14041402

@@ -1483,6 +1481,9 @@ ALTER TABLE `HealthCheckAgent`
14831481
ADD CONSTRAINT `HealthCheckAgent_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`),
14841482
ADD CONSTRAINT `HealthCheckAgent_ibfk_2` FOREIGN KEY (`healthCheckId`) REFERENCES `HealthCheck` (`healthCheckId`);
14851483

1484+
ALTER TABLE `htp_User`
1485+
ADD CONSTRAINT `User_ibfk_1` FOREIGN KEY (`rightGroupId`) REFERENCES `RightGroup` (`rightGroupId`);
1486+
14861487
ALTER TABLE `NotificationSetting`
14871488
ADD CONSTRAINT `NotificationSetting_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`);
14881489

@@ -1512,9 +1513,6 @@ ALTER TABLE `TaskWrapper`
15121513
ADD CONSTRAINT `TaskWrapper_ibfk_1` FOREIGN KEY (`hashlistId`) REFERENCES `Hashlist` (`hashlistId`),
15131514
ADD CONSTRAINT `TaskWrapper_ibfk_2` FOREIGN KEY (`accessGroupId`) REFERENCES `AccessGroup` (`accessGroupId`);
15141515

1515-
ALTER TABLE `htp_User`
1516-
ADD CONSTRAINT `User_ibfk_1` FOREIGN KEY (`rightGroupId`) REFERENCES `RightGroup` (`rightGroupId`);
1517-
15181516
ALTER TABLE `Zap`
15191517
ADD CONSTRAINT `Zap_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`),
15201518
ADD CONSTRAINT `Zap_ibfk_2` FOREIGN KEY (`hashlistId`) REFERENCES `Hashlist` (`hashlistId`);

0 commit comments

Comments
 (0)