Skip to content
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
16 changes: 8 additions & 8 deletions Jenkinsfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@ pipeline {
parallel {
stage('Run UI tests on Linux') {
steps {
runRCPTT 'rcptt-client-test', branchName, jobName, productsBuild.number, 'Linux', artifactFilterRcptt, "${outputDir}/gui-test-linux", 'GUI Test Report (Linux)', 'linux-verince-client-log'
runRCPTT 'rcptt-client-test', branchName, jobName, productsBuild.number, 'Linux', artifactFilterRcptt, "${outputDir}/gui-test-linux", 'GUI Test Report (Linux)', 'linux-verinice-client-log'
}
}
stage('Run UI tests on macOS Current') {
steps {
runRCPTT 'rcptt-client-test', branchName, jobName, productsBuild.number, 'macOS current', artifactFilterRcptt, "${outputDir}/gui-test-mac-current", 'GUI Test Report (macOS)', 'macc-verince-client-log'
runRCPTT 'rcptt-client-test', branchName, jobName, productsBuild.number, 'macOS current', artifactFilterRcptt, "${outputDir}/gui-test-mac-current", 'GUI Test Report (macOS)', 'macc-verinice-client-log'
}
}
stage('Run UI tests on Windows') {
steps {
runRCPTT 'rcptt-client-test', branchName, jobName, productsBuild.number, 'Windows 10', artifactFilterRcptt, "${outputDir}/gui-test-windows", 'GUI Test Report (Windows 10)', 'win-verince-client-log'
runRCPTT 'rcptt-client-test', branchName, jobName, productsBuild.number, 'Windows 10', artifactFilterRcptt, "${outputDir}/gui-test-windows", 'GUI Test Report (Windows 10)', 'win-verinice-client-log'
}
}
stage('Run 3-tier UI tests') {
steps {
runRCPTT 'rcptt-server-test', branchName, jobName, productsBuild.number, null, artifactFilterRcptt, "${outputDir}/gui-test-3-tier", 'GUI Test Report (3-tier)', '3-tier-verince-client-log'
recordLogMessages '3-tier-verince-server-log', "${outputDir}/gui-test-3-tier", 'verinice-server.*', 'serverlogparsed-nighly.txt', 'log4j'
runRCPTT 'rcptt-server-test', branchName, jobName, productsBuild.number, null, artifactFilterRcptt, "${outputDir}/gui-test-3-tier", 'GUI Test Report (3-tier)', '3-tier-verinice-client-log'
recordLogMessages '3-tier-verinice-server-log', "${outputDir}/gui-test-3-tier", 'verinice-server.*', 'serverlogparsed-nighly.txt', 'log4j'
}
}
stage('Run reporting tests') {
Expand All @@ -77,7 +77,7 @@ pipeline {
steps {
script {
def target = "${outputDir}/performance-test-standalone"
runRCPTT 'rcptt-client-performance-test', branchName, jobName, productsBuild.number, null, artifactFilterRcptt, target, 'GUI Test Report (Performance Standalone)', 'performance-verince-client-log'
runRCPTT 'rcptt-client-performance-test', branchName, jobName, productsBuild.number, null, artifactFilterRcptt, target, 'GUI Test Report (Performance Standalone)', 'performance-verinice-client-log'
createPerformancePlot("${target}/gui-test-runner/result/metric.csv", 'Standalone')
}
}
Expand All @@ -86,8 +86,8 @@ pipeline {
steps {
script {
def target = "${outputDir}/performance-test-3-tier"
runRCPTT 'rcptt-server-performance-test', branchName, jobName, productsBuild.number, null, artifactFilterRcptt, target, 'GUI Test Report (Performance 3-tier)','3-tier-performance-verince-client-log'
recordLogMessages '3-tier-performance-verince-server-log', "${outputDir}/performance-test-3-tier", 'verinice-server.*', 'serverlogparsed-nighly.txt', 'log4j'
runRCPTT 'rcptt-server-performance-test', branchName, jobName, productsBuild.number, null, artifactFilterRcptt, target, 'GUI Test Report (Performance 3-tier)','3-tier-performance-verinice-client-log'
recordLogMessages '3-tier-performance-verinice-server-log', "${outputDir}/performance-test-3-tier", 'verinice-server.*', 'serverlogparsed-nighly.txt', 'log4j'
createPerformancePlot("${target}/gui-test-runner/result/metric.csv", '3-tier')
}
}
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.rcptt-client-performance-test
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pipeline {
junit testDataPublishers: [[$class: 'StabilityTestDataPublisher']], testResults: 'gui-test-runner/result/results.junit.xml'
perfReport filterRegex: '', sourceDataFiles: 'gui-test-runner/result/results.junit.xml'
recordIssues(tools: [groovyScript(parserId: 'aut-eclipse-log', pattern: 'gui-test-runner/result/log/verinice-aut/.log*')])
recordIssues(tools: [groovyScript(id: 'verince-client-log', name: 'verince-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
recordIssues(tools: [groovyScript(id: 'verinice-client-log', name: 'verinice-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
}
// https://github.com/jenkinsci/gitlab-plugin/issues/713#issuecomment-412875379
script {
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.rcptt-client-test
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pipeline {
junit testDataPublishers: [[$class: 'StabilityTestDataPublisher']], testResults: 'gui-test-runner/result/results.junit.xml'
perfReport filterRegex: '', sourceDataFiles: 'gui-test-runner/result/results.junit.xml'
recordIssues(tools: [groovyScript(parserId: 'aut-eclipse-log', pattern: 'gui-test-runner/result/log/verinice-aut/.log*')])
recordIssues(tools: [groovyScript(id: 'verince-client-log', name: 'verince-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
recordIssues(tools: [groovyScript(id: 'verinice-client-log', name: 'verinice-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
}
// https://github.com/jenkinsci/gitlab-plugin/issues/713#issuecomment-412875379
script {
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.rcptt-product-report-test
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pipeline {
junit testDataPublishers: [[$class: 'StabilityTestDataPublisher']], testResults: 'gui-test-runner/result/results.junit.xml'
perfReport filterRegex: '', sourceDataFiles: 'gui-test-runner/result/results.junit.xml'
recordIssues(tools: [groovyScript(parserId: 'aut-eclipse-log', pattern: 'gui-test-runner/result/log/verinice-aut/.log*')])
recordIssues(tools: [groovyScript(id: 'verince-client-log', name: 'verince-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
recordIssues(tools: [groovyScript(id: 'verinice-client-log', name: 'verinice-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: true, reportDir: 'gui-test-runner/result', reportFiles: 'results.html', reportName: 'Gui Test Report', reportTitles: "${env.job_to_copy_from}"])
}
post {
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile.rcptt-server-performance-test
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ pipeline {
junit testDataPublishers: [[$class: 'StabilityTestDataPublisher']], testResults: 'gui-test-runner/result/results.junit.xml'
perfReport filterRegex: '', sourceDataFiles: 'gui-test-runner/result/results.junit.xml'
recordIssues(tools: [groovyScript(parserId: 'aut-eclipse-log', pattern: 'gui-test-runner/result/log/verinice-aut/.log*')])
recordIssues(tools: [groovyScript(id: 'verince-client-log', name: 'verince-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
recordIssues(tools: [groovyScript(id: 'verince-server-log', name: 'verince-server-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/serverlogparsed.txt')])
recordIssues(tools: [groovyScript(id: 'verinice-client-log', name: 'verinice-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
recordIssues(tools: [groovyScript(id: 'verinice-server-log', name: 'verinice-server-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/serverlogparsed.txt')])
}
// https://github.com/jenkinsci/gitlab-plugin/issues/713#issuecomment-412875379
script {
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile.server-rcptt-test
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ pipeline {
junit testDataPublishers: [[$class: 'StabilityTestDataPublisher']], testResults: 'gui-test-runner/result/results.junit.xml'
perfReport filterRegex: '', sourceDataFiles: 'gui-test-runner/result/results.junit.xml'
recordIssues(tools: [groovyScript(parserId: 'aut-eclipse-log', pattern: 'gui-test-runner/result/log/verinice-aut/.log*')])
recordIssues(tools: [groovyScript(id: 'verince-client-log', name: 'verince-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
recordIssues(tools: [groovyScript(id: 'verince-server-log', name: 'verince-server-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/serverlogparsed.txt')])
recordIssues(tools: [groovyScript(id: 'verinice-client-log', name: 'verinice-client-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/clientlogparsed.txt')])
recordIssues(tools: [groovyScript(id: 'verinice-server-log', name: 'verinice-server-log', parserId: 'verinice-log-parser', pattern: 'gui-test-runner/result/log/serverlogparsed.txt')])
}
// https://github.com/jenkinsci/gitlab-plugin/issues/713#issuecomment-412875379
script {
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/en/verinice-user_manual_EN.tex
Original file line number Diff line number Diff line change
Expand Up @@ -3273,7 +3273,7 @@ \section{Report repository}
the file name, the name displayed in the report dialog window and the
file format. In addition to that, you may choose that the report
supports the selection of 'all elements/scopes'. Note that not all reports are useable in
this way. In general only reports based on a 'verince report query' are
this way. In general only reports based on a 'verinice report query' are
capable to run with all elements or scopes. Adding a report template to the report repository
requires a valid template file path and file format. The file path should not contain
spaces nor special characters, like umlauts. If you do not
Expand Down
2 changes: 1 addition & 1 deletion gui-test-runner/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# rcptt testing for verinice

This ant build executes the rcptt tests for verinice.
It takes a verince.zip and executes the tests.
It takes a verinice.zip and executes the tests.

most of the configuration properties are placed in the 'gui-test.properties' file.

Expand Down
8 changes: 4 additions & 4 deletions gui-test-runner/start-gui-test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ workspace
target: start.verinice.client
================================= -->
<target name="start.verinice.client" depends="configure.verinice" description="start a verinice instance">
<echo>Start verinice: ${verince.program} on ${os.name}</echo>
<exec executable="${verince.program}" dir="${verinice-aut-path}" spawn="true" vmlauncher="false"/>
<echo>Start verinice: ${verinice.program} on ${os.name}</echo>
<exec executable="${verinice.program}" dir="${verinice-aut-path}" spawn="true" vmlauncher="false"/>
<echo>wait for verinice ...</echo>
<waitfor maxwait="${verinice.timeout}" maxwaitunit="second" timeoutproperty="timeout">
<http url="http://localhost:${verinice.server.port}/GetHitroConfig" />
Expand Down Expand Up @@ -713,7 +713,7 @@ ${verinice.jre}/jre/${java-library-location}
<sequential>
<echo>running client tests with target: @{target}</echo>
<property name="mode" value="Client"/>
<property name="verince.program" location="${verinice-aut-path}/${verinice-executable}" />
<property name="verinice.program" location="${verinice-aut-path}/${verinice-executable}" />

<antcall target="configure-aut" />
<antcall target="start.verinice.client" />
Expand Down Expand Up @@ -752,7 +752,7 @@ ${verinice.jre}/jre/${java-library-location}
target: test-v-designer
================================= -->
<target name="test-v-designer" depends="init" description="Runs the gui tests for v-designer.">
<property name="verince.program" location="${verinice-aut-path}/verinice" />
<property name="verinice.program" location="${verinice-aut-path}/verinice" />

<antcall target="configure-v-designer-aut">
</antcall>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* Exception is thrown if a different 'configurationType'
* is detected in authorization configuration files
* 'verinice-auth-default.xml' and 'verince-auth.xml'.
* 'verinice-auth-default.xml' and 'verinice-auth.xml'.
*
* See xml schema 'verinice-auth.xsd' for details about the configuration.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
corresponding tasks will be created according. Therefore the whole process aims at optimising security while
keeping the effort as low as possible.<br />
<br />
The Greenbone vulnerability scan can be configured to transfer the found vulnerabilities to <b>verince.PRO</b>
The Greenbone vulnerability scan can be configured to transfer the found vulnerabilities to <b>verinice.PRO</b>
automatically. In this case <b>verinice.PRO</b> compares the current scan result with the implementation status
according to the workflow and performs necessary adjustments. Vulnerabilities that have been set to
<b>recitified</b> falsely will be reopened - <b>verinice.PRO</b> recreates the correct links between assets and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
se provádí na pravidelně, budou zranitelnosti, které nebyly opraveny, znovu zjištěny a budou vytvořeny odpovídající úkoly.
Proto je celý proces zaměřen na optimalizaci bezpečnosti při udržení pracnosti na co nejnižší úrovni.<br />
<br />
Greenbone skenu zranitenosti může být automaticky nastaven an přenos nalezených zranitelností do <b>verince.PRO</b>
Greenbone skenu zranitenosti může být automaticky nastaven an přenos nalezených zranitelností do <b>verinice.PRO</b>
V tom případě <b>verinice.PRO</b> porovná aktuální výsledky skenu se stavem implentace podle pracovního postupu
a provede nezbytné úpravy. Zranitelnosti které byly nesprávně nastaveny na <b>napraveno</b> budou znovu otevřeny
- <b>verinice.PRO</b> znovuvytvoří správné vazby nezi aktivy a scénáři. recreates the correct links between assets and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
i compiti corrispondenti saranno creati secondo. Pertanto l'intero processo mira ad ottimizzare la sicurezza mentre
mantenendo lo sforzo quanto pi? basso possibile. <br />
<br />
La scansione di vulnerabilit? di Greenbone pu? essere configurata per trasferire le vulnerabilit? rilevate a <b> verince.PRO </b>
La scansione di vulnerabilit? di Greenbone pu? essere configurata per trasferire le vulnerabilit? rilevate a <b> verinice.PRO </b>
automaticamente. In questo caso <b> verinice.PRO </b> confronta il risultato di scansione corrente con lo stato di implementazione
in base al flusso di lavoro e effettua le regolazioni necessarie. Vulnerabilit? che sono state impostate
<b> recitificato </b> verr? riaperto - <b> verinice.PRO </b> ricrea i collegamenti corretti tra le attivit? e
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>

<cheatsheet title="Protezione baseline IT con Greenbone e verince">
<cheatsheet title="Protezione baseline IT con Greenbone e verinice">

<intro>
<description>
Expand Down
2 changes: 1 addition & 1 deletion sernet.gs.ui.rcp.main/plugin_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ page.name.9=Hinweisdialoge
page.name.10=Standard Verzeichnisse
page.name.11=Suche
page.name.12=VNA Import / Export
page.name.13=Verince-Perspektiven
page.name.13=Verinice-Perspektiven
perspective.name=BSI-Grundschutz nach 100-x
perspective.name.0=Datenschutz
perspective.name.1=Information Security Management
Expand Down
2 changes: 1 addition & 1 deletion verinice-gui-tests/bp/bp-screenshots.test
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ screen-shot-catalog-view "catalog-view.png"
// bp view
screen-shot-bp-view "modernisierter-it-grundschutz-view.png"

//application toolbar verince
//application toolbar verinice
get-button Notizen | get-object | invoke getParent | invoke getParent | save-screenshot [concat $imagedir
"/application-toolbar.png"]
//application toolbar complete
Expand Down