Commit 52b1597c authored by PidgeyL's avatar PidgeyL
Browse files

extract functions to avoid duplicate code

parent 81260ed2

lib/Toolkit.py

+42 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ 
# Copyright (c) 2014-2015 	Pieter-Jan Moreels - pieterjan.moreels@gmail.com



# Imports

from dateutil import tz

import dateutil.parser

import re



# Note of warning: CPEs like cpe:/o:microsoft:windows_8:-:-:x64 are given to us by Mitre

#  x64 will be parsed as Edition in this case, not Architecture

def toStringFormattedCPE(cpe,autofill=False):
@@ -79,3 +83,41 @@ def pad(seq, target_length, padding=None): 
      return seq

    seq.extend([padding] * (target_length - length))

    return seq



def currentTime(utc):

    timezone = tz.tzlocal()

    utc = dateutil.parser.parse(utc)

    output = utc.astimezone(timezone)

    output = output.strftime('%d-%m-%Y - %H:%M')

    return output



def isURL(string):

    urlTypes= [re.escape(x) for x in ['http://','https://', 'www.']]

    return re.match("^(" + "|".join(urlTypes) + ")", string)



def vFeedName(string):

    string=string.replace('map_','')

    string=string.replace('cve_','')

    return string.title()



def convertDateToDBFormat(string):

    result = None

    try:

        result = time.strptime(string, "%d-%m-%Y")

    except:

        pass

    try:

        result = time.strptime(string, "%d-%m-%y")

    except:

        pass

    try:

        result = time.strptime(string, "%d/%m/%Y")

    except:

        pass

    try:

        result = time.strptime(string, "%d/%m/%y")

    except:

        pass

    if result is not None:

        result = time.strftime('%Y-%m-%d', result)

    return result

web/index.py

+7 −51
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ from passlib.hash import pbkdf2_sha256 
from redis import exceptions as redisExceptions



import json

from dateutil import tz

import dateutil.parser

import re

import argparse

import time
@@ -41,7 +39,7 @@ from logging.handlers import RotatingFileHandler 


from lib.User import User

from lib.Config import Configuration

from lib.Toolkit import toStringFormattedCPE, toOldCPE

from lib.Toolkit import toStringFormattedCPE, toOldCPE, currentTime, isURL, vFeedName, convertDateToDBFormat

import lib.CVEs as cves

from bin.db_whitelist import *

from bin.db_blacklist import *
@@ -160,9 +158,6 @@ def getBlacklistRegexes(): 




def addCPEToList(cpe, listType, cpeType=None):

    #cpe = urllib.parse.quote_plus(cpe).lower()

    #cpe = cpe.replace("%3a", ":")

    #cpe = cpe.replace("%2f", "/")

    if not cpeType:

        cpeType='cpe'

    if listType.lower() in ("blacklist", "black", "b", "bl"):
@@ -182,29 +177,6 @@ def getVersionsOfProduct(product): 
    return sorted(list(p))





def convertDateToDBFormat(string):

    result = None

    try:

        result = time.strptime(string, "%d-%m-%Y")

    except:

        pass

    try:

        result = time.strptime(string, "%d-%m-%y")

    except:

        pass

    try:

        result = time.strptime(string, "%d/%m/%Y")

    except:

        pass

    try:

        result = time.strptime(string, "%d/%m/%y")

    except:

        pass

    if result is not None:

        result = time.strftime('%Y-%m-%d', result)

    return result





def adminStats():

    cveU = db.info.find_one({'db': 'cve'})

    cpeU = db.info.find_one({'db': 'cpe'})
@@ -804,12 +776,8 @@ def page_not_found(e): 


# filters

@app.template_filter('currentTime')

def currentTime(utc):

    timezone = tz.tzlocal()

    utc = dateutil.parser.parse(utc)

    output = utc.astimezone(timezone)

    output = output.strftime('%d-%m-%Y - %H:%M')

    return output

def currentTimeFilter(utc):

    return currentTime(utc)





@app.template_filter('htmlDecode')
@@ -822,25 +790,13 @@ def htmlEncode(string): 
    return urllib.parse.quote_plus(string).lower()





@app.template_filter('impact')

def impact(string):

    if string.lower() == "none":

        return "good"

    elif string.lower() == "partial":

        return "medium"

    elif string.lower() == "complete":

        return "bad"



@app.template_filter('isURL')

def isURL(string):

    urlTypes= [re.escape(x) for x in ['http://','https://', 'www.']]

    return re.match("^(" + "|".join(urlTypes) + ")", string)

def isURLFilter(string):

    return isURL(string)



@app.template_filter('vFeedName')

def vFeedName(string):

    string=string.replace('map_','')

    string=string.replace('cve_','')

    return string.title()

def vFeedNameFilter(string):

    return vFeedName(string)



# signal handlers

def sig_handler(sig, frame):

web/minimal-web.py

+7 −50
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ from flask.ext.pymongo import PyMongo 
from redis import exceptions as redisExceptions



import json

from dateutil import tz

import dateutil.parser

import re

import argparse

import time
@@ -36,7 +34,7 @@ import logging 
from logging.handlers import RotatingFileHandler



from lib.Config import Configuration

from lib.Toolkit import toStringFormattedCPE, toOldCPE

from lib.Toolkit import toStringFormattedCPE, toOldCPE, currentTime, isURL, vFeedName, convertDateToDBFormat

import lib.CVEs as cves



# parse command line arguments
@@ -75,35 +73,11 @@ def getBrowseList(vendor): 
    return result







def getVersionsOfProduct(product):

    p = redisdb.smembers("p:" + product)

    return sorted(list(p))





def convertDateToDBFormat(string):

    result = None

    try:

        result = time.strptime(string, "%d-%m-%Y")

    except:

        pass

    try:

        result = time.strptime(string, "%d-%m-%y")

    except:

        pass

    try:

        result = time.strptime(string, "%d/%m/%Y")

    except:

        pass

    try:

        result = time.strptime(string, "%d/%m/%y")

    except:

        pass

    if result is not None:

        result = time.strftime('%Y-%m-%d', result)

    return result





    cveU = db.info.find_one({'db': 'cve'})

    cpeU = db.info.find_one({'db': 'cpe'})

    cpeOtherU = db.info.find_one({'db': 'cpeother'})
@@ -220,7 +194,6 @@ def filterLast(r): 
    # retrieving data

    cve = filter_logic(unlisted, timeSelect, startDate, endDate,

                       timeTypeSelect, cvssSelect, cvss, rejectedSelect, pageLength, r)



    return render_template('index-minimal.html', settings=settings, cve=cve, r=r, pageLength=pageLength)



@app.route('/api/cpe2.3/<path:cpe>', methods=['GET'])
@@ -335,12 +308,8 @@ def page_not_found(e): 


# filters

@app.template_filter('currentTime')

def currentTime(utc):

    timezone = tz.tzlocal()

    utc = dateutil.parser.parse(utc)

    output = utc.astimezone(timezone)

    output = output.strftime('%d-%m-%Y - %H:%M')

    return output

def currentTimeFilter(utc):

    return currentTime(utc)





@app.template_filter('htmlDecode')
@@ -353,25 +322,13 @@ def htmlEncode(string): 
    return urllib.parse.quote_plus(string).lower()





@app.template_filter('impact')

def impact(string):

    if string.lower() == "none":

        return "good"

    elif string.lower() == "partial":

        return "medium"

    elif string.lower() == "complete":

        return "bad"



@app.template_filter('isURL')

def isURL(string):

    urlTypes= [re.escape(x) for x in ['http://','https://', 'www.']]

    return re.match("^(" + "|".join(urlTypes) + ")", string)

def isURLFilter(string):

    return isURL(string)



@app.template_filter('vFeedName')

def vFeedName(string):

    string=string.replace('map_','')

    string=string.replace('cve_','')

    return string.title()

def vFeedNameFilter(string):

    return vFeedName(string)



# signal handlers

def sig_handler(sig, frame):

web/static/css/style.css

+3 −3
Original line number Diff line number Diff line
@@ -71,14 +71,14 @@ ul.nav li.dropdown:hover > ul.dropdown-menu { 
   table-layout: fixed

}



.good {

.impact-none {

   color:green;

}



.medium {

.impact-partial {

   color:orange;

}



.bad {

.impact-complete {

   color:red;

}

web/templates/cve-minimal.html

+3 −3
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ 
                    <table class="table table-hover table-bordered cve-info">

                      <thead><tr class="warning"><td>Confidentiality</td><td>Integrity</td><td>Availability</td></tr></thead>

                      <tr>

                        <td class="{{cve['impact']['confidentiality']|impact}}">{{cve['impact']['confidentiality']}}</td>

                        <td class="{{cve['impact']['integrity']|impact}}">{{cve['impact']['integrity']}}</td>

                        <td class="{{cve['impact']['availability']|impact}}">{{cve['impact']['availability']}}</td>

                        <td class="impact-{{cve['impact']['confidentiality']|lower}}">{{cve['impact']['confidentiality']}}</td>

                        <td class="impact-{{cve['impact']['integrity']|lower}}">{{cve['impact']['integrity']}}</td>

                        <td class="impact-{{cve['impact']['availability']|lower}}">{{cve['impact']['availability']}}</td>

                      </tr>

                    </table>

                  </td>

CRA Git | Maintained and supported by SUSTech CRA and CCSE