Skip to content

Commit f1a6051

Browse files
RuskonertRuskonert
committed
UPDATED: Changed coulmn
1 parent f61a2d7 commit f1a6051

File tree

1 file changed

+37
-38
lines changed

1 file changed

+37
-38
lines changed

‎nvdnist.py

+37-38
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ def workstation(sql, tablename, jsonElement):
8686
base = Nvdnist(new_db)
8787
base.use_database(sql.database)
8888

89-
cve_id = str(jsonElement['cve_id'])
89+
ID = str(jsonElement['cve_id'])
9090
p = re.compile(r'CVE-(\d{4})-.+$')
91-
cve_year = str(p.match(cve_id).group(1))
91+
year = str(p.match(ID).group(1))
9292

93-
assigner = str(jsonElement['assigner'])
93+
ASSIGNER = str(jsonElement['assigner'])
9494
data_type = str(jsonElement['data_type'])
9595
data_format = str(jsonElement['data_format'])
9696
data_version = str(jsonElement['data_version'])
@@ -330,11 +330,10 @@ def load(self, obj):
330330
return raw_file, collection
331331

332332
def default_table_column(self):
333-
a1 = TableColumn("_number", "INT PRIMARY KEY AUTO_INCREMENT")
334-
a2 = TableColumn("cve_year", "VARCHAR(5)")
333+
a2 = TableColumn("year", "VARCHAR(5)")
335334

336-
a3 = TableColumn("cve_id", "VARCHAR(24)")
337-
a4 = TableColumn('assigner', "VARCHAR(15)")
335+
a3 = TableColumn("ID", "VARCHAR(24)")
336+
a4 = TableColumn('ASSIGNER', "VARCHAR(15)")
338337
a5 = TableColumn("data_type", 'VARCHAR(5)')
339338
a6 = TableColumn("data_format", "VARCHAR(10)")
340339
a7 = TableColumn("data_version", "VARCHAR(5)")
@@ -345,37 +344,37 @@ def default_table_column(self):
345344
a11 = TableColumn("cve_data_version", "VARCHAR(5)")
346345
a12 = TableColumn("cpe", "TEXT")
347346

348-
a13 = TableColumn('baseMetricV2_version', "VARCHAR(10)")
349-
a14 = TableColumn('baseMetricV2_vectorString', "VARCHAR(50)")
350-
a15 = TableColumn('baseMetricV2_confidentialityImpact', "VARCHAR(10)")
351-
a16 = TableColumn('baseMetricV2_availabilityImpact', "VARCHAR(10)")
352-
a17 = TableColumn('baseMetricV2_baseScore', "VARCHAR(10)")
353-
a18 = TableColumn('baseMetricV2_exploitabilityScore', "VARCHAR(10)")
354-
a19 = TableColumn('baseMetricV2_impactScore', "VARCHAR(10)")
355-
aa19 = TableColumn('baseMetricV2_integrityImpact', "VARCHAR(10)")
356-
a20 = TableColumn('baseMetricV2_severity', "VARCHAR(10)")
357-
a21 = TableColumn('baseMetricV2_obtainAllPrivilege', "VARCHAR(10)")
358-
a22 = TableColumn('baseMetricV2_obtainUserPrivilege', "VARCHAR(10)")
359-
a23 = TableColumn('baseMetricV2_obtainOtherPrivilege', "VARCHAR(10)")
360-
a24 = TableColumn('baseMetricV2_userInteractionRequired', "VARCHAR(10)")
361-
a25 = TableColumn('baseMetricV2_accessVector', "VARCHAR(48)")
362-
a26 = TableColumn('baseMetricV2_accessComplexity', "VARCHAR(10)")
363-
a27 = TableColumn('baseMetricV2_authentication', "VARCHAR(10)")
364-
365-
a28 = TableColumn('baseMetricV3_version', "VARCHAR(10)")
366-
a29 = TableColumn('baseMetricV3_vectorString', "VARCHAR(50)")
367-
a30 = TableColumn('baseMetricV3_confidentialityImpact', "VARCHAR(10)")
368-
a31 = TableColumn('baseMetricV3_integrityImpact', "VARCHAR(10)")
369-
a32 = TableColumn('baseMetricV3_availabilityImpact', "VARCHAR(10)")
370-
a33 = TableColumn('baseMetricV3_baseScore', "VARCHAR(10)")
371-
a34 = TableColumn('baseMetricV3_exploitabilityScore', "VARCHAR(10)")
372-
a35 = TableColumn('baseMetricV3_impactScore', "VARCHAR(10)")
373-
a36 = TableColumn('baseMetricV3_attackVector', "VARCHAR(36)")
374-
a37 = TableColumn('baseMetricV3_attackComplexity', "VARCHAR(10)")
375-
a38 = TableColumn('baseMetricV3_privillegesRequired', "VARCHAR(10)")
376-
aa38 = TableColumn('baseMetricV3_userInteraction', "VARCHAR(10)")
377-
a39 = TableColumn('baseMetricV3_baseSeverity', "VARCHAR(10)")
378-
a40 = TableColumn('baseMetricV3_scope', "VARCHAR(10)")
347+
a13 = TableColumn('baseMetricV2.version', "VARCHAR(10)")
348+
a14 = TableColumn('baseMetricV2.vectorString', "VARCHAR(50)")
349+
a15 = TableColumn('baseMetricV2.confidentialityImpact', "VARCHAR(10)")
350+
a16 = TableColumn('baseMetricV2.availabilityImpact', "VARCHAR(10)")
351+
a17 = TableColumn('baseMetricV2.baseScore', "VARCHAR(10)")
352+
a18 = TableColumn('baseMetricV2.exploitabilityScore', "VARCHAR(10)")
353+
a19 = TableColumn('baseMetricV2.impactScore', "VARCHAR(10)")
354+
aa19 = TableColumn('baseMetricV2.integrityImpact', "VARCHAR(10)")
355+
a20 = TableColumn('baseMetricV2.severity', "VARCHAR(10)")
356+
a21 = TableColumn('baseMetricV2.obtainAllPrivilege', "VARCHAR(10)")
357+
a22 = TableColumn('baseMetricV2.obtainUserPrivilege', "VARCHAR(10)")
358+
a23 = TableColumn('baseMetricV2.obtainOtherPrivilege', "VARCHAR(10)")
359+
a24 = TableColumn('baseMetricV2.userInteractionRequired', "VARCHAR(10)")
360+
a25 = TableColumn('baseMetricV2.accessVector', "VARCHAR(48)")
361+
a26 = TableColumn('baseMetricV2.accessComplexity', "VARCHAR(10)")
362+
a27 = TableColumn('baseMetricV2.authentication', "VARCHAR(10)")
363+
364+
a28 = TableColumn('baseMetricV3.version', "VARCHAR(10)")
365+
a29 = TableColumn('baseMetricV3.vectorString', "VARCHAR(50)")
366+
a30 = TableColumn('baseMetricV3.confidentialityImpact', "VARCHAR(10)")
367+
a31 = TableColumn('baseMetricV3.integrityImpact', "VARCHAR(10)")
368+
a32 = TableColumn('baseMetricV3.availabilityImpact', "VARCHAR(10)")
369+
a33 = TableColumn('baseMetricV3.baseScore', "VARCHAR(10)")
370+
a34 = TableColumn('baseMetricV3.exploitabilityScore', "VARCHAR(10)")
371+
a35 = TableColumn('baseMetricV3.impactScore', "VARCHAR(10)")
372+
a36 = TableColumn('baseMetricV3.attackVector', "VARCHAR(36)")
373+
a37 = TableColumn('baseMetricV3.attackComplexity', "VARCHAR(10)")
374+
a38 = TableColumn('baseMetricV3.privillegesRequired', "VARCHAR(10)")
375+
aa38 = TableColumn('baseMetricV3.userInteraction', "VARCHAR(10)")
376+
a39 = TableColumn('baseMetricV3.baseSeverity', "VARCHAR(10)")
377+
a40 = TableColumn('baseMetricV3.scope', "VARCHAR(10)")
379378

380379
a41 = TableColumn('publishedDate', "VARCHAR(20)")
381380
a42 = TableColumn('lastModifiedDate', "VARCHAR(20)")

0 commit comments

Comments
 (0)