Update python package and bump default version

Author: udiboy1209

python/nyuctf/__main__.py

@@ -3,19 +3,31 @@
 from .dataset import CTFDataset
 from .challenge import CTFChallenge
 
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.ERROR)
 
-parser = argparse.ArgumentParser("Print challenge details")
-parser.add_argument("--challenge", required=True, help="Challenge name")
-parser.add_argument("--dataset", required=True, help="Dataset JSON")
+parser = argparse.ArgumentParser("List challenges that match filter")
+parser.add_argument("-y", "--year", help="Challenge name")
+parser.add_argument("-e", "--event", help="Event (CSAW-Quals, CSAW-Finals)")
+parser.add_argument("-c", "--category", help="Category (rev, pwn, forensics, web, misc)")
+parser.add_argument("-n", "--name", help="Challenge name")
+parser.add_argument("-d", "--dataset", default="test", help="Dataset name or JSON path")
+parser.add_argument("-D", "--details", action="store_true", help="Print details")
 args = parser.parse_args()
 
-ds = CTFDataset(args.dataset)
-challenge = CTFChallenge(ds.get(args.challenge), ds.basedir)
+if args.dataset and args.dataset.endswith(".json"):
+    ds = CTFDataset(dataset_json=args.dataset)
+else:
+    ds = CTFDataset(split=args.dataset)
 
-print("Name:", challenge.name)
-print("Category:", challenge.category)
-print("Compose:", challenge.container)
-print("Flag:", challenge.real_flag)
-print("Files:", challenge.files)
-print("Server:", challenge.server_name, challenge.port)
+chals = ds.filter(year=args.year, event=args.event, category=args.category, challenge=args.name)
+
+for chal in map(lambda c: CTFChallenge(c, basedir=ds.basedir), chals):
+    print(chal.canonical_name)
+    if args.details:
+        print("\tName:", chal.name)
+        print("\tCategory:", chal.category)
+        print("\tCompose:", chal.container)
+        print("\tFlag:", chal.flag)
+        print("\tFiles:", chal.files)
+        if chal.server_name:
+            print("\tServer:", chal.server_name, chal.port)

python/nyuctf/challenge.py

@@ -62,7 +62,6 @@ def load_challenge(self, challenge_json : Path):
             self.flag_format = "not provided"
         else:
             self.flag_format = re.sub(r'\{.*?\}', '{...}', self.flag)
-        assert self.flag_format != self.flag, f"Flag format for {self.asiname} would leak the flag!"
 
         self.server_name = self.challenge.get("box", None)
         self.port = self.challenge.get("internal_port", None)

python/nyuctf/download.py

@@ -3,8 +3,8 @@
 from pathlib import Path
 
 REPO_URL = "https://github.com/NYU-LLM-CTF/NYU_CTF_Bench.git"
-AVAILABLE_VERSIONS = ["v20241008"]
-DEFAULT_VERSION = "v20241008"
+AVAILABLE_VERSIONS = ["v20250206", "v20241008"]
+DEFAULT_VERSION = "v20250206"
 DEFAULT_DIRECTORY = "~/.nyuctf"
 
 def download_dataset(version=DEFAULT_VERSION, download_dir=DEFAULT_DIRECTORY):