fix the rules length and add possibility to have a wildcard rule to u…

…se them all
ScriptSathi · Jul 30, 2023 · 7a071fb · 7a071fb
1 parent 2500ad4
commit 7a071fb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 225 deletions.
diff --git a/hashkitty-server/src/lib/API/RouteHandler.ts b/hashkitty-server/src/lib/API/RouteHandler.ts
@@ -316,7 +316,7 @@ export class RouteHandler {
    ): void => {
       try {
          const listString = FsUtils.listFileInDir(Constants.rulesPath);
-         const list = this.buildListBase(listString);
+         const list = this.buildListBase(['* (All Rules)', ...listString]);
          this.getFileInDirResp(res, list);
       } catch (e) {
          this.getFileInDirResp(res, [], Constants.rulesPath, e);

diff --git a/hashkitty-server/src/lib/API/Sanitizer.ts b/hashkitty-server/src/lib/API/Sanitizer.ts
@@ -376,13 +376,18 @@ export class Sanitizer {
       for (const ruleFileName of rules) {
          try {
             if (ruleFileName.length > 0) {
-               const files = FsUtils.listFileInDir(Constants.rulesPath);
-               const fileHasBeenFound = files.find(file => {
-                  return file === ruleFileName;
-               });
-               if (!fileHasBeenFound) {
-                  fileExists = false;
-                  this.setError('wrongData', 'rules');
+               const isWildCardRule = ruleFileName.includes('*');
+               if (isWildCardRule) {
+                  rules = ['* (All Rules)'];
+               } else {
+                  const files = FsUtils.listFileInDir(Constants.rulesPath);
+                  const fileHasBeenFound = files.find(file => {
+                     return file === ruleFileName;
+                  });
+                  if (!fileHasBeenFound) {
+                     fileExists = false;
+                     this.setError('wrongData', 'rules');
+                  }
                }
             }
          } catch (error) {

diff --git a/hashkitty-server/src/lib/ORM/Factory.ts b/hashkitty-server/src/lib/ORM/Factory.ts
diff --git a/hashkitty-server/src/lib/ORM/entity/Options.ts b/hashkitty-server/src/lib/ORM/entity/Options.ts
@@ -43,7 +43,7 @@ export class Options {
    @JoinColumn({ name: 'wordlist_id', referencedColumnName: 'id' })
    wordlistId?: number;
 
-   @Column('varchar', { name: 'rule_name', default: '' })
+   @Column('text', { name: 'rule_name', default: '' })
    rules?: string;
 
    @Column('varchar', { name: 'potfile_name', default: '' })

diff --git a/hashkitty-server/src/lib/hashcat/HashcatGenerator.ts b/hashkitty-server/src/lib/hashcat/HashcatGenerator.ts
@@ -118,7 +118,7 @@ export class HashcatGenerator {
       if (this.task.options.rules) {
          flags.push({
             key: 'rulesFile',
-            value: this.task.options.rules.split(','),
+            value: this.createRulesPaths(this.task.options.rules.split(',')),
          });
       }
       if (this.task.options.workloadProfileId) {
@@ -140,6 +140,14 @@ export class HashcatGenerator {
       return this.buildFlags(flags);
    }
 
+   private createRulesPaths(rules: string[]): string[] {
+      const hasWildCardRule = rules.some(rule => rule.includes('*'));
+      if (hasWildCardRule) {
+         rules = FsUtils.listFileInDir(Constants.rulesPath);
+      }
+      return rules.map(rule => path.join(Constants.rulesPath, rule));
+   }
+
    private prepareRestoreFlags(): CmdData[] {
       const flags = this.defaultFlags;
       const restoreFlag: PartialCmdData = { key: 'restore' };