mirror of
https://github.com/ysoftdevs/DependencyCheck.git
synced 2026-03-18 07:14:09 +01:00
Ruby bunder: Code needed to disable the analyzer in the CLI if desired.
This commit is contained in:
@@ -252,6 +252,7 @@ public class App {
|
|||||||
final boolean cMakeDisabled = cli.isCmakeDisabled();
|
final boolean cMakeDisabled = cli.isCmakeDisabled();
|
||||||
final boolean pyPkgDisabled = cli.isPythonPackageDisabled();
|
final boolean pyPkgDisabled = cli.isPythonPackageDisabled();
|
||||||
final boolean autoconfDisabled = cli.isAutoconfDisabled();
|
final boolean autoconfDisabled = cli.isAutoconfDisabled();
|
||||||
|
final boolean bundleAuditDisabled = cli.isBundleAuditDisabled();
|
||||||
final boolean assemblyDisabled = cli.isAssemblyDisabled();
|
final boolean assemblyDisabled = cli.isAssemblyDisabled();
|
||||||
final boolean nuspecDisabled = cli.isNuspecDisabled();
|
final boolean nuspecDisabled = cli.isNuspecDisabled();
|
||||||
final boolean centralDisabled = cli.isCentralDisabled();
|
final boolean centralDisabled = cli.isCentralDisabled();
|
||||||
@@ -325,6 +326,7 @@ public class App {
|
|||||||
Settings.setBoolean(Settings.KEYS.ANALYZER_CMAKE_ENABLED, !cMakeDisabled);
|
Settings.setBoolean(Settings.KEYS.ANALYZER_CMAKE_ENABLED, !cMakeDisabled);
|
||||||
Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, !nuspecDisabled);
|
Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, !nuspecDisabled);
|
||||||
Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, !assemblyDisabled);
|
Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, !assemblyDisabled);
|
||||||
|
Settings.setBoolean(Settings.KEYS.ANALYZER_BUNDLE_AUDIT_ENABLED, !bundleAuditDisabled);
|
||||||
Settings.setBoolean(Settings.KEYS.ANALYZER_OPENSSL_ENABLED, !cli.isOpenSSLDisabled());
|
Settings.setBoolean(Settings.KEYS.ANALYZER_OPENSSL_ENABLED, !cli.isOpenSSLDisabled());
|
||||||
Settings.setBoolean(Settings.KEYS.ANALYZER_NODE_PACKAGE_ENABLED, !cli.isNodeJsDisabled());
|
Settings.setBoolean(Settings.KEYS.ANALYZER_NODE_PACKAGE_ENABLED, !cli.isNodeJsDisabled());
|
||||||
Settings.setBoolean(Settings.KEYS.ANALYZER_RUBY_GEMSPEC_ENABLED, !cli.isRubyGemspecDisabled());
|
Settings.setBoolean(Settings.KEYS.ANALYZER_RUBY_GEMSPEC_ENABLED, !cli.isRubyGemspecDisabled());
|
||||||
|
|||||||
@@ -417,6 +417,8 @@ public final class CliParser {
|
|||||||
.addOption(disableJarAnalyzer)
|
.addOption(disableJarAnalyzer)
|
||||||
.addOption(disableArchiveAnalyzer)
|
.addOption(disableArchiveAnalyzer)
|
||||||
.addOption(disableAssemblyAnalyzer)
|
.addOption(disableAssemblyAnalyzer)
|
||||||
|
.addOption(OptionBuilder.withLongOpt(ARGUMENT.DISABLE_BUNDLE_AUDIT)
|
||||||
|
.withDescription("Disable the Ruby Bundler Audit Analyzer.").create())
|
||||||
.addOption(disablePythonDistributionAnalyzer)
|
.addOption(disablePythonDistributionAnalyzer)
|
||||||
.addOption(disableCmakeAnalyzer)
|
.addOption(disableCmakeAnalyzer)
|
||||||
.addOption(disablePythonPackageAnalyzer)
|
.addOption(disablePythonPackageAnalyzer)
|
||||||
@@ -534,6 +536,16 @@ public final class CliParser {
|
|||||||
return (line != null) && line.hasOption(ARGUMENT.DISABLE_ASSEMBLY);
|
return (line != null) && line.hasOption(ARGUMENT.DISABLE_ASSEMBLY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns true if the disableBundleAudit command line argument was specified.
|
||||||
|
*
|
||||||
|
* @return true if the disableBundleAudit command line argument was specified; otherwise false
|
||||||
|
*/
|
||||||
|
public boolean isBundleAuditDisabled() {
|
||||||
|
return (line != null) && line.hasOption(ARGUMENT.DISABLE_BUNDLE_AUDIT);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true if the disablePyDist command line argument was specified.
|
* Returns true if the disablePyDist command line argument was specified.
|
||||||
*
|
*
|
||||||
@@ -1129,6 +1141,10 @@ public final class CliParser {
|
|||||||
* Disables the Assembly Analyzer.
|
* Disables the Assembly Analyzer.
|
||||||
*/
|
*/
|
||||||
public static final String DISABLE_ASSEMBLY = "disableAssembly";
|
public static final String DISABLE_ASSEMBLY = "disableAssembly";
|
||||||
|
/**
|
||||||
|
* Disables the Ruby Bundler Audit Analyzer.
|
||||||
|
*/
|
||||||
|
public static final String DISABLE_BUNDLE_AUDIT = "disableBundleAudit";
|
||||||
/**
|
/**
|
||||||
* Disables the Nuspec Analyzer.
|
* Disables the Nuspec Analyzer.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ Short | Argument Name | Paramete
|
|||||||
| \-\-disablePyPkg | | Sets whether the Python Package Analyzer will be used. | false
|
| \-\-disablePyPkg | | Sets whether the Python Package Analyzer will be used. | false
|
||||||
| \-\-disableNodeJS | | Sets whehter the Node.js Package Analyzer will be used. | false
|
| \-\-disableNodeJS | | Sets whehter the Node.js Package Analyzer will be used. | false
|
||||||
| \-\-disableRubygems | | Sets whether the Ruby Gemspec Analyzer will be used. | false
|
| \-\-disableRubygems | | Sets whether the Ruby Gemspec Analyzer will be used. | false
|
||||||
| \-\-disableBundlerAudit | | Sets whether the Ruby Bundler Audit Analyzer will be used. | false
|
| \-\-disableBundleAudit | | Sets whether the Ruby Bundler Audit Analyzer will be used. | false
|
||||||
| \-\-disableAutoconf | | Sets whether the Autoconf Analyzer will be used. | false
|
| \-\-disableAutoconf | | Sets whether the Autoconf Analyzer will be used. | false
|
||||||
| \-\-disableOpenSSL | | Sets whether the OpenSSL Analyzer will be used. | false
|
| \-\-disableOpenSSL | | Sets whether the OpenSSL Analyzer will be used. | false
|
||||||
| \-\-disableCmake | | Sets whether the Cmake Analyzer will be used. | false
|
| \-\-disableCmake | | Sets whether the Cmake Analyzer will be used. | false
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ public class RubyBundleAuditAnalyzer extends AbstractFileTypeAnalyzer {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected String getAnalyzerEnabledSettingKey() {
|
protected String getAnalyzerEnabledSettingKey() {
|
||||||
return Settings.KEYS.ANALYZER_RUBY_GEMSPEC_ENABLED;
|
return Settings.KEYS.ANALYZER_BUNDLE_AUDIT_ENABLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -206,6 +206,10 @@ public final class Settings {
|
|||||||
* The properties key for whether the CMake analyzer is enabled.
|
* The properties key for whether the CMake analyzer is enabled.
|
||||||
*/
|
*/
|
||||||
public static final String ANALYZER_CMAKE_ENABLED = "analyzer.cmake.enabled";
|
public static final String ANALYZER_CMAKE_ENABLED = "analyzer.cmake.enabled";
|
||||||
|
/**
|
||||||
|
* The properties key for whether the Ruby Bundler Audit analyzer is enabled.
|
||||||
|
*/
|
||||||
|
public static final String ANALYZER_BUNDLE_AUDIT_ENABLED = "analyzer.bundle.audit.enabled";
|
||||||
/**
|
/**
|
||||||
* The properties key for whether the .NET Assembly analyzer is enabled.
|
* The properties key for whether the .NET Assembly analyzer is enabled.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user