Add PowerAuditor version in ribbon

Author: 1mm0rt41PC

PowerAuditor_LastUpdateVulndb.bat

@@ -0,0 +1,24 @@
+@echo off
+:: PowerAuditor - A simple script to help report writing by https://github.com/1mm0rt41PC
+::
+:: Filename: PowerAuditor_LastUpdateVulndb.bat - Script for auto update
+::
+:: This program is free software; you can redistribute it and/or modify
+:: it under the terms of the GNU General Public License as published by
+:: the Free Software Foundation; either version 2 of the License, or
+:: (at your option) any later version.
+::
+:: This program is distributed in the hope that it will be useful,
+:: but WITHOUT ANY WARRANTY; without even the implied warranty of
+:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+:: GNU General Public License for more details.
+::
+:: You should have received a copy of the GNU General Public License
+:: along with this program; see the file COPYING. If not, write to the
+:: Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+set mypath=%~dp0
+set mypath=%mypath:~0,-1%
+pushd %mypath%\vulndb
+git log -1 --format=%%cd --date=short 2>>&1
+popd

PowerAuditor_last.xlsm

@@ -30,16 +30,19 @@ https://www.rondebruin.nl/win/s2/win003.htm
 		<tabs>
 			<tab id="PowerAuditor" label="PowerAuditor" insertBeforeQ="TabFormat">
 				<group id="Reports" label="Reports" autoScale="true">
-					<button id="FillExcelWithProof" label="Fill excel with proof" imageMso="TableAutoFormat" onAction="ThisWorkbook.FillExcelWithProof"/>
+					<button id="FillExcelWithProof" label="Fill excel with proof" imageMso="TableAutoFormat" onAction="ThisWorkbook.fillExcelWithProof"/>
 					<button id="ExportExcelToWordTemplate" label="Export Excel to Word" imageMso="HappyFace" onAction="ThisWorkbook.ExportExcelToWordTemplate"/>
-					<button id="GenSynthesis" label="Generate synthesis" imageMso="ChartInsert" onAction="ThisWorkbook.GenSynthesis"/>
-					<button id="ExportFinalStaticsDocuments" label="Generate final RA/RD/XL" imageMso="PageOrientationPortraitLandscape" size="large" onAction="ThisWorkbook.ExportFinalStaticsDocuments"/>
+					<button id="GenSynthesis" label="Generate synthesis" imageMso="ChartInsert" onAction="ThisWorkbook.genSynthesis"/>
+					<button id="ExportFinalStaticsDocuments" label="Generate final RA/RD/XL" imageMso="PageOrientationPortraitLandscape" size="large" onAction="ThisWorkbook.exportFinalStaticsDocuments"/>
 				</group>
 				<group id="TeamSync" label="TeamSync" autoScale="true">
-					<button id="ExportVulnToGit" label="Export vuln to git" imageMso="FileSaveAsWebPage" size="large" onAction="ThisWorkbook.ExportVulnToGit"/>
+					<button id="ExportVulnToGit" label="Export vuln to git" imageMso="FileSaveAsWebPage" size="large" onAction="ThisWorkbook.exportVulnToGit"/>
 				</group>
 				<group id="Dev" label="Dev" autoScale="true">
-					<button id="toProd" label="Send template to prod" getEnabled="CustomRibbonTab.GetEnabled" imageMso="SendStatusReport" onAction="ThisWorkbook.toProd"/>
+					<button id="toProd" label="Send template to prod" getEnabled="CustomRibbonTab.isDevMode" imageMso="SendStatusReport" onAction="ThisWorkbook.toProd"/>
+					<editBox id="PowerAuditorVersion" imageMso="OpenAttachedCalendar" label="PowerAuditor version" getText="CustomRibbonTab.getVersion" enabled="false" sizeString="99999999999999"/>
+					<editBox id="TemplateVersion" imageMso="OpenAttachedCalendar" label="Template version" getText="CustomRibbonTab.getVersion" enabled="false" sizeString="99999999999999"/>
+					<editBox id="VulnDBVersion" imageMso="OpenAttachedCalendar" label="VulnDB version" getText="CustomRibbonTab.LastUpdate" enabled="false" sizeString="99999999999999"/>
 				</group>
 			</tab>
 		</tabs>

dev/PowerAuditor.xlsm

@@ -19,25 +19,35 @@ Option Explicit
 ' Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 Private G_Ribbon As Object
+Private G_TemplateVersion As String
 
 Private Sub onLoad(rb As Object)
     Debug.Print "Custon ribbon loaded"
     Set CustomRibbonTab.G_Ribbon = rb
     CustomRibbonTab.G_Ribbon.ActivateTab "PowerAuditor"
 End Sub
 
-
 Private Sub RibbonOnChange(control As Object, val)
     Worksheets("PowerAuditor").Range(control.id).Value2 = val
 End Sub
 
-
-Private Sub GetEnabled(control As Object, ByRef enabled)
+Private Sub isDevMode(control As Object, ByRef enabled)
     enabled = Common.isDevMode()
 End Sub
 
+Private Sub getVersion(control As IRibbonControl, ByRef text)
+    On Error Resume Next
+    text = Range(control.id).Value2
+    Err.Clear
+End Sub
 
-Private Sub GetText(control As IRibbonControl, ByRef text)
-    text = Worksheets("PowerAuditor").Range(control.id).Value2
+Private Sub lastUpdate(control As IRibbonControl, ByRef text)
+    Debug.Print "Getting LastUpdate"
+    text = Common.trim(IOFile.getOutpoutFromShellCmd(IOFile.getPowerAuditorPath() & "\PowerAuditor_LastUpdateVulndb.bat "))
 End Sub
 
+Public Sub invalidAlltext()
+    On Error Resume Next
+    CustomRibbonTab.G_Ribbon.InvalidateControl "TemplateVersion"
+    Err.Clear
+End Sub

dev/src/ribbon.xml

@@ -119,8 +119,6 @@ Public Function renameDocument(inst, ext As String, pType As String, Optional By
 End Function
 
 
-
-
 Public Function git(sArgs As String, Optional sRepo As String = "vulndb") As Boolean
     Debug.Print "Git " & sArgs & " on <" & sRepo & ">"
     Dim tmpFile As String: tmpFile = Environ("temp") & "\" & randomString(7)
@@ -281,9 +279,18 @@ Public Function getVulnDBPath(sVulnerabilityName As String, Optional bCreateIfNo
     sDesktopIni = sDesktopIni & "PersonalizedName=" & sVulnerabilityName & vbCrLf
 
     If Not isFolder Then MkDir (sPath)
-    Call IOFile.fileSetContent(sPath & "\desktop.ini", sDesktopIni)
-    oFS.getfile(sPath & "\desktop.ini").Attributes = 39
-    oFS.getfolder(sPath).Attributes = 17
+    Dim sDesktopIniPath As String: sDesktopIniPath = sPath & "\desktop.ini"
+    If IOFile.filenameEncode(sVulnerabilityName) = sVulnerabilityName Then
+        If isFile(sDesktopIniPath) Then
+            oFS.getfile(sDesktopIniPath).Attributes = 32
+            Call removeFile(sDesktopIniPath)
+        End If
+    Else
+        oFS.getfile(sDesktopIniPath).Attributes = 32
+        Call IOFile.fileSetContent(sPath & "\desktop.ini", sDesktopIni)
+        oFS.getfile(sPath & "\desktop.ini").Attributes = 39
+        oFS.getfolder(sPath).Attributes = 17
+    End If
     getVulnDBPath = sPath
 End Function
 

dev/src/vba/CustomRibbonTab.bas.vb

@@ -157,6 +157,7 @@ Sub exportFinalStaticsDocuments(control As Object)
     Dim ws As Worksheet: Set ws = Worksheets(getInfo("REPORT_TYPE"))
     Dim wDoc As Object: Set wDoc = Word.getInstance()
     Call RT.exportFinalStaticsDocuments(wDoc, ws)
+    Call IOFile.runCmd("explorer.exe " & ThisWorkbook.Path & "\output", 1, False)
     MsgBox "Generated"
 End Sub
 
@@ -168,6 +169,13 @@ Public Sub ToProd(control As Object)
     End If
     Application.DisplayAlerts = False
     Dim sFilepath As String
+    
+    If Month(Now) < 10 Then
+        Range("PowerAuditorVersion").Value2 = Year(Now) & "-0" & Month(Now) & "-" & Day(Now)
+    Else
+        Range("PowerAuditorVersion").Value2 = Year(Now) & "-" & Month(Now) & "-" & Day(Now)
+    End If
+    Range("TemplateVersion").Value2 = Range("PowerAuditorVersion").Value2
 
     ' On upgrade le template vers la bonne destination
     Dim wb_exp As Workbook: Set wb_exp = Workbooks.Add

dev/src/vba/IOFile.bas.vb

@@ -170,14 +170,16 @@ Public Sub insertVuln(wDoc As Object, ws As Worksheet, iRow As Integer)
     Dim subCC As Object
     Dim sPath As String: sPath = IOFile.getVulnDBPath(name)
     If IOFile.isFile(sPath & "\desc.html") Then
-        For i = 0 To UBound(toImportHTML)
-            If IOFile.isFile(sPath & "\" & toImportHTML(i) & ".html") Then
-                Set subCC = wDoc.SelectContentControlsByTitle("VLN_" & toImportHTML(i) & "_" & id)(1)
-                If Common.isEmptyString(Common.trim(subCC.Range.text, "x")) Then
-                    Call subCC.Range.InsertFile(sPath & "\" & toImportHTML(i) & ".html", , , False, False)
+        If MsgBox("Import data from VulnDB for the vulnerability >" & name & "< ?", vbYesNo, "PowerAuditor") = vbYes Then
+            For i = 0 To UBound(toImportHTML)
+                If IOFile.isFile(sPath & "\" & toImportHTML(i) & ".html") Then
+                    Set subCC = wDoc.SelectContentControlsByTitle("VLN_" & toImportHTML(i) & "_" & id)(1)
+                    If Common.isEmptyString(Common.trim(subCC.Range.text, "x")) Then
+                        Call subCC.Range.InsertFile(sPath & "\" & toImportHTML(i) & ".html", , , False, False)
+                    End If
                 End If
-            End If
-        Next i
+            Next i
+        End If
     End If
 
     ' On insert les preuves qui proviennent du dossier VULN
@@ -405,21 +407,21 @@ Public Sub updateColorBoldSynthesis(wDoc As Object, aText As Variant, Optional v
     Dim i As Integer, j As Integer
     Dim color As Variant
     'color = Array("GRIS", "JAUNE", "ORANGE", "ROUGE")
-    If vColor = True And VarType(vColor) = vbBoolean Then
-        vColor = Array(RGB(133, 133, 133), RGB(255, 255, 0), RGB(255, 192, 0), RGB(255, 0, 0))
+    If VarType(vColor) = vbBoolean Then
+        If vColor = True Then vColor = Array(RGB(133, 133, 133), RGB(255, 255, 0), RGB(255, 192, 0), RGB(255, 0, 0))
     End If
     For i = 0 To UBound(aText)
         With wDoc.Content.Find
             .ClearFormatting
             With .Replacement
                 .ClearFormatting
                 .Font.Bold = True
-                If VarType(vColor) = vbArray Then
+                If VarType(vColor) <> vbBoolean Then
                     .Font.color = vColor(Left(aText(i), 1) - 1)
                 End If
                 .Font.Shadow = True
             End With
-            If VarType(vColor) = vbArray Then
+            If VarType(vColor) <> vbBoolean Then
                 .Execute FindText:="{" & aText(i) & "}", replacewith:=Split(aText(i), " - ")(1), Format:=True, Replace:=wdReplaceAll
             Else
                 .Execute FindText:="**" & aText(i) & "**", replacewith:=aText(i), Format:=True, Replace:=wdReplaceAll

dev/src/vba/ThisWorkbook.cls.vb

@@ -120,6 +120,7 @@ reTry_loadExcelSheet:
         .Interior.color = 0
         .Font.color = 0
     End With
+    Call CustomRibbonTab.invalidAlltext
     Versionning.G_bDisableExportVBCode = True
     Call ws_main.Parent.Save
     Call Versionning.loadModule(Split(getInfo("REPORT_TYPE"), "-")(0))