hohn/sarif-cli
1
0
Fork 0
mirror of https://github.com/hohn/sarif-cli.git synced 2025-12-16 17:23:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update how project_id is generated

Browse Source 
previously relied on assumption:
naming like: <org>/<project> in
repositoryUri
now just uses full repositoryUri
This commit is contained in:
Kristen Newbury
2023-01-05 16:37:55 -05:00
parent fc2c6bac99
commit 1a915e4de8
4 changed files with 16 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/sarif-extract-scans
View File

@@ -130,17 +130,14 @@ scantabs = ScanTables()
@dataclass
class ExternalInfo:
project_id : int
project_id: pd.UInt64Dtype()
scan_id : pd.UInt64Dtype()
sarif_file_name : str
ql_query_id : str
external_info = ExternalInfo(
scan_spec["project_id"],
pd.NA,
scan_spec["scan_id"],
scan_spec["sarif_file_name"],
# TODO: Take ql_query_id from where? (git commit id of the ql query set)
'deadbeef00',
scan_spec["sarif_file_name"]
)
#

18
bin/sarif-extract-scans-runner
View File

@@ -161,7 +161,6 @@ for path in paths:
# Paths and components
#
path = path.rstrip()
project, component = path.split('/')
#
# Scan specification
#
@@ -171,30 +170,25 @@ for path in paths:
scan_id = hash.hash_unique(data)
scan_spec = {
# assuming sarif file names are like <org>/<repo>
# however this will be replaced down the line with the repoURI if possible
# still, leaving here in case later versions of this tool do not rely on that property being there
# in that case this will be the best guess
"project_id": hash.hash_unique((project+"-"+component).encode()), # pd.UInt64Dtype()
"scan_id": scan_id, # pd.Int64Dtype()
"sarif_file_name": path, # pd.StringDtype()
}
#
# If using outermost output directory, create project directory:
# (like <outer_dir>/<project>/*.scantables)
# (like <outer_dir>/<repositoryUri>/*.scantables)
#
try: os.mkdir(outer_dir+ project, mode=0o755)
try: os.mkdir(outer_dir+ path, mode=0o755)
except FileExistsError: pass
scan_spec_file = os.path.join(outer_dir+ project, component + ".scanspec")
scan_spec_file = os.path.join(outer_dir+ path + ".scanspec")
with open(scan_spec_file, 'w') as fp:
json.dump(scan_spec, fp)
#
# Table output directory
#
output_dir = os.path.join(outer_dir+ project, component + ".scantables")
output_dir = os.path.join(outer_dir+ path + ".scantables")
try: os.mkdir(output_dir, mode=0o755)
except FileExistsError: pass
#
@@ -215,8 +209,8 @@ for path in paths:
with open(args.successful_runs, 'wb') as outfile:
pickle.dump(successful_runs, outfile)
scan_log_file = os.path.join(outer_dir+ project, component + ".scanlog")
csv_outfile = os.path.join(outer_dir+ project, component)
scan_log_file = os.path.join(outer_dir+ path + ".scanlog")
csv_outfile = os.path.join(outer_dir+ path)
runstats = subprocess.run(['sarif-extract-scans', scan_spec_file, output_dir, csv_outfile, "-f", args.input_signature],
capture_output=True, text=True)
if runstats.returncode == 0: