Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Runs on Python3 for me #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fortify/externalmetadata.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from lxml.etree import ElementNamespaceClassLookup
from lxml.objectify import ObjectifyElementClassLookup, ElementMaker, ObjectifiedElement
from lxml import objectify
from fvdl import FortifyObjectifiedDataElement
from .fvdl import FortifyObjectifiedDataElement

ExternalMetadataParser = objectify.makeparser(ns_clean=True,
remove_blank_text=True,
Expand Down Expand Up @@ -43,4 +43,4 @@ def get_shortcuts_for_name(self, name):
nsmap={
None: 'xmlns://www.fortifysoftware.com/schema/externalMetadata'
}
)
)
2 changes: 1 addition & 1 deletion fortify/fpr.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class FPR(object):
cache = {}

def __init__(self, project, **kwargs):
if isinstance(project, basestring):
if isinstance(project, str):
self._project = project = openfpr(project)
elif isinstance(project, dict):
self._project = project
Expand Down
8 changes: 4 additions & 4 deletions fortify/fvdl.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ class lazyproperty(object):

def __init__(self,fget):
self.fget = fget
self.func_name = fget.__name__
self.__name__ = fget.__name__

def __get__(self,obj,cls):
if obj is None:
return None
value = self.fget(obj)
setattr(obj,self.func_name,value)
setattr(obj,self.__name__,value)
return value

AuditParser = objectify.makeparser(ns_clean=True,
Expand Down Expand Up @@ -113,11 +113,11 @@ def datetime(self):
class TimeStampElement(FortifyObjectifiedDataElement):
@property
def date(self):
return datetime.date(*map(int, self.get('date').split('-')))
return datetime.date(*list(map(int, self.get('date').split('-'))))

@property
def time(self):
return datetime.time(*map(int, self.get('time').split(':')))
return datetime.time(*list(map(int, self.get('time').split(':'))))

@property
def datetime(self):
Expand Down
2 changes: 1 addition & 1 deletion fortify/issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
# object representing a Fortify issue
class Issue:
def __init__(self, iid, ruleid, kingdom, type, subtype):
self.metadata = {}
self.id = iid # instance ID
self.ruleid = ruleid
self.kingdom = kingdom
self.type = type
self.subtype = subtype
self.suppressed = False
self.metadata = {}

# Factory method to create an instance from a vulnerability XML object directly
@classmethod
Expand Down
13 changes: 7 additions & 6 deletions fortify/project.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from __future__ import print_function

from . import FPR, Issue, RemovedIssue
import sys
import logging
Expand Down Expand Up @@ -62,10 +63,10 @@ def create_project(fprpath):
ri = RemovedIssue.from_auditxml(removed)
project.add_or_update_issue(ri)

removedissues = [i for i in issues.values() if i.removed]
suppressedissues = [i for i in issues.values() if i.suppressed]
hiddenissues = [i for i in issues.values() if i.hidden]
naiissues = [i for i in issues.values() if i.is_NAI()]
removedissues = [i for i in list(issues.values()) if i.removed]
suppressedissues = [i for i in list(issues.values()) if i.suppressed]
hiddenissues = [i for i in list(issues.values()) if i.hidden]
naiissues = [i for i in list(issues.values()) if i.is_NAI()]
eprint("Got [%d] issues, [%d] hidden, [%d] NAI, [%d] Suppressed, [%d] Removed" % (len(issues), len(hiddenissues), len(naiissues), len(suppressedissues), len(removedissues)))

return project # A fortify project, containing one or more issues, with metadata
Expand Down Expand Up @@ -120,7 +121,7 @@ def print_vuln_counts(self):
'Medium': 0,
'Low': 0,
}
for i in self._issues.values():
for i in list(self._issues.values()):
# exclude hidden, NAI and suppressed (TODO: could be configurable)
if not (i.hidden or i.is_NAI() or i.suppressed):
if i.risk is None:
Expand All @@ -134,7 +135,7 @@ def print_vuln_counts(self):
def print_vuln_summaries(self, open_high_priority):
# TODO: enable sorting by severity and file_line by default.
print("file_line,path,id,kingdom,type_subtype,severity,nai,filtered,suppressed,removed,analysis")
for i in self._issues.itervalues():
for i in self._issues.values():
if not open_high_priority or i.is_open_high_priority:
print("%s:%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s" % \
(i.metadata['shortfile'], i.metadata['line'], i.metadata['file'], i.id, i.kingdom, i.category, i.risk, i.is_NAI(), "H" if i.hidden else "V", i.suppressed, i.removed, i.analysis))
Expand Down