diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-java-alma8 b/.github/docker/packaging/Dockerfile.packaging-plugins-java-alma8 index dadf3fb26..5c691290a 100644 --- a/.github/docker/packaging/Dockerfile.packaging-plugins-java-alma8 +++ b/.github/docker/packaging/Dockerfile.packaging-plugins-java-alma8 @@ -6,9 +6,9 @@ RUN bash -e <.*" ${{ inputs.version_file }} | sed 's/.*\\(.*\\)<\\/version>.*/\\1/'`).toString().trim(); + } else if ('${{ steps.get_stability.outputs.stability }}' === 'testing') { const branchName = "${{ github.head_ref || github.ref_name }}"; const matches = branchName.match(/^(?:release|hotfix)-(\d{8})$/); if (matches) { diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/AbstractHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/AbstractHandler.java index b94c3ab17..2a45a7f6e 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/AbstractHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/AbstractHandler.java @@ -26,6 +26,7 @@ import java.text.NumberFormat; import java.util.Locale; import com.ibm.as400.access.AS400; +import com.ibm.as400.access.SecureAS400; import com.ibm.as400.access.AS400SecurityException; import com.ibm.as400.access.ConnectionEvent; import com.ibm.as400.access.ConnectionListener; @@ -44,11 +45,13 @@ public abstract class AbstractHandler { protected String host = null; protected String login = null; protected String password = null; + protected Integer ssl = 0; - public AbstractHandler(final String host, final String login, final String password) { + public AbstractHandler(final String host, final String login, final String password, final Integer ssl) { this.host = host; this.login = login; this.password = password; + this.ssl = ssl; } static { @@ -77,7 +80,28 @@ public abstract class AbstractHandler { properties.setLoginTimeout(Conf.as400LoginTimeout); properties.setSoTimeout(Conf.as400ReadTimeout); - final AS400 system = new AS400(this.host, this.login, this.password); + if (this.ssl == 1) { + SecureAS400 system = new SecureAS400(this.host, this.login, this.password); + system.setSocketProperties(properties); + system.addConnectionListener(new ConnectionListener() { + @Override + public void connected(final ConnectionEvent event) { + ConnectorLogger.getInstance().getLogger().debug("Connect event service : " + event.getService()); + } + + @Override + public void disconnected(final ConnectionEvent event) { + ConnectorLogger.getInstance().getLogger().debug("Disconnect event service : " + event.getService()); + } + }); + + system.validateSignon(); + + return (AS400)system; + } + + AS400 system = new AS400(this.host, this.login, this.password); + system.setSocketProperties(properties); system.addConnectionListener(new ConnectionListener() { @Override diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/CommandHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/CommandHandler.java index c0f07dc41..117981655 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/CommandHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/CommandHandler.java @@ -34,8 +34,8 @@ import com.centreon.connector.as400.dispatcher.check.ResponseData; */ public class CommandHandler extends AbstractHandler implements ICommandHandler { - public CommandHandler(final String host, final String login, final String password) { - super(host, login, password); + public CommandHandler(final String host, final String login, final String password, final Integer ssl) { + super(host, login, password, ssl); } @Override diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/DiskHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/DiskHandler.java index aa3d12cc9..bf2b663ce 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/DiskHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/DiskHandler.java @@ -38,10 +38,10 @@ public class DiskHandler extends AbstractHandler implements IDiskHandler { private QyaspolYasp0300PcmlHandler qyaspolPcmlHandler = null; - public DiskHandler(final String host, final String login, final String password) + public DiskHandler(final String host, final String login, final String password, final Integer ssl) throws AS400SecurityException, IOException { - super(host, login, password); - this.qyaspolPcmlHandler = new QyaspolYasp0300PcmlHandler(host, login, password); + super(host, login, password, ssl); + this.qyaspolPcmlHandler = new QyaspolYasp0300PcmlHandler(host, login, password, ssl); } @Override diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/JobHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/JobHandler.java index 18bd80014..cf9bc6ab7 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/JobHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/JobHandler.java @@ -37,8 +37,8 @@ import com.centreon.connector.as400.dispatcher.check.ResponseData; public class JobHandler extends AbstractHandler implements IJobHandler { private final JobCache jobCache; - public JobHandler(final String host, final String login, final String password) { - super(host, login, password); + public JobHandler(final String host, final String login, final String password, final Integer ssl) { + super(host, login, password, ssl); this.jobCache = new JobCache(this); } diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/JobQueueHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/JobQueueHandler.java index 3c18f9a6e..eb1dc94b6 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/JobQueueHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/JobQueueHandler.java @@ -37,8 +37,8 @@ import com.centreon.connector.as400.dispatcher.check.ResponseData; */ public class JobQueueHandler extends AbstractHandler implements IJobQueueHandler { - public JobQueueHandler(final String host, final String login, final String password) { - super(host, login, password); + public JobQueueHandler(final String host, final String login, final String password, final Integer ssl) { + super(host, login, password, ssl); } @Override diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/SubSystemHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/SubSystemHandler.java index bff97d317..80e6ab326 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/SubSystemHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/SubSystemHandler.java @@ -42,9 +42,9 @@ import com.centreon.connector.as400.dispatcher.check.ResponseData; */ public class SubSystemHandler extends AbstractHandler implements ISubSystemHandler { - public SubSystemHandler(final String host, final String login, final String password) + public SubSystemHandler(final String host, final String login, final String password, final Integer ssl) throws AS400SecurityException, IOException { - super(host, login, password); + super(host, login, password, ssl); } @Override diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/SystemHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/SystemHandler.java index a74d8b46b..d7af64315 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/SystemHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/SystemHandler.java @@ -45,14 +45,14 @@ import com.centreon.connector.as400.dispatcher.check.ResponseData; public class SystemHandler extends AbstractHandler implements ISystemHandler { private SystemStatus status = null; - public SystemHandler(final String host, final String login, final String password) + public SystemHandler(final String host, final String login, final String password, final Integer ssl) throws AS400SecurityException, IOException { - this(host, login, password, null); + this(host, login, password, null, ssl); } - public SystemHandler(final String host, final String login, final String password, SystemStatus as400Status) + public SystemHandler(final String host, final String login, final String password, SystemStatus as400Status, final Integer ssl) throws AS400SecurityException, IOException { - super(host, login, password); + super(host, login, password, ssl); this.status = as400Status == null ? new SystemStatus(getNewAs400()) : as400Status; } diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/disk/QyaspolYasp0300PcmlHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/disk/QyaspolYasp0300PcmlHandler.java index 80715ee28..002fff3d2 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/disk/QyaspolYasp0300PcmlHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/impl/disk/QyaspolYasp0300PcmlHandler.java @@ -26,6 +26,7 @@ import java.util.LinkedList; import java.util.List; import com.ibm.as400.access.AS400; +import com.ibm.as400.access.SecureAS400; import com.ibm.as400.access.AS400Message; import com.ibm.as400.access.AS400SecurityException; import com.ibm.as400.access.ConnectionEvent; @@ -61,11 +62,13 @@ public class QyaspolYasp0300PcmlHandler { String host = null; String login = null; String password = null; + Integer ssl = 0; - public QyaspolYasp0300PcmlHandler(final String host, final String login, final String password) { + public QyaspolYasp0300PcmlHandler(final String host, final String login, final String password, final Integer ssl) { this.host = host; this.login = login; this.password = password; + this.ssl = ssl; } public void addYasp0300Data(final Yasp0300Data data) { @@ -238,7 +241,27 @@ public class QyaspolYasp0300PcmlHandler { properties.setLoginTimeout(Conf.as400LoginTimeout); properties.setSoTimeout(Conf.as400ReadTimeout); - final AS400 system = new AS400(this.host, this.login, this.password); + if (this.ssl == 1) { + SecureAS400 system = new SecureAS400(this.host, this.login, this.password); + system.setSocketProperties(properties); + system.addConnectionListener(new ConnectionListener() { + @Override + public void connected(final ConnectionEvent event) { + ConnectorLogger.getInstance().getLogger().debug("Connect event service : " + event.getService()); + } + + @Override + public void disconnected(final ConnectionEvent event) { + ConnectorLogger.getInstance().getLogger().debug("Disconnect event service : " + event.getService()); + } + }); + + system.validateSignon(); + + return (AS400)system; + } + + AS400 system = new AS400(this.host, this.login, this.password); system.setSocketProperties(properties); system.addConnectionListener(new ConnectionListener() { @Override diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/msgqueue/CachedMessageQueueHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/msgqueue/CachedMessageQueueHandler.java index ea8d53de0..6858948b5 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/msgqueue/CachedMessageQueueHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/msgqueue/CachedMessageQueueHandler.java @@ -102,8 +102,8 @@ public class CachedMessageQueueHandler extends AbstractHandler implements ICache return sb.toString(); } - public CachedMessageQueueHandler(final String host, final String login, final String password) { - super(host, login, password); + public CachedMessageQueueHandler(final String host, final String login, final String password, final Integer ssl) { + super(host, login, password, ssl); } @Override diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/msgqueue/MessageQueueHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/msgqueue/MessageQueueHandler.java index 8431de861..aaa3a8038 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/msgqueue/MessageQueueHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/msgqueue/MessageQueueHandler.java @@ -42,8 +42,8 @@ import com.centreon.connector.as400.dispatcher.check.ResponseData; */ public class MessageQueueHandler extends AbstractHandler implements IMessageQueueHandler { - public MessageQueueHandler(final String host, final String login, final String password) { - super(host, login, password); + public MessageQueueHandler(final String host, final String login, final String password, final Integer ssl) { + super(host, login, password, ssl); } @Override diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/wrkprb/WorkWithProblemHandler.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/wrkprb/WorkWithProblemHandler.java index fa3fbbd7e..c8ab55ba8 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/wrkprb/WorkWithProblemHandler.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/check/handler/wrkprb/WorkWithProblemHandler.java @@ -69,8 +69,8 @@ public class WorkWithProblemHandler extends AbstractHandler { private final boolean SSL = false; private final String logPrefix; - public WorkWithProblemHandler(final String host, final String login, final String password) { - super(host, login, password); + public WorkWithProblemHandler(final String host, final String login, final String password, final Integer ssl) { + super(host, login, password, ssl); this.logPrefix = "[" + WorkWithProblemHandler.INSTANCE_ID++ + "]"; } diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/client/IClient.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/client/IClient.java index 77a22d2bb..91f690fc5 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/client/IClient.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/client/IClient.java @@ -40,5 +40,7 @@ public interface IClient { String getAs400CheckType(); + Integer getAs400Ssl(); + Object getAs400Arg(String key); } diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/client/impl/AbstractClient.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/client/impl/AbstractClient.java index 0c22486d7..96a5bece5 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/client/impl/AbstractClient.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/client/impl/AbstractClient.java @@ -42,6 +42,7 @@ abstract class AbstractClient implements IClient { private String as400Password = null; private String as400CheckType = null; private String as400Args = null; + private Integer as400Ssl = 0; private List> argList = new ArrayList>(); @Override @@ -77,6 +78,11 @@ abstract class AbstractClient implements IClient { return this.input.getArg(key); } + @Override + public Integer getAs400Ssl() { + return this.input.getSsl(); + } + public List> getAs400ArgList(String key) { Object arg = this.input.getArg(key); if (arg == null) { diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/check/CheckDispatcher.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/check/CheckDispatcher.java index bce110267..121c2e03e 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/check/CheckDispatcher.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/check/CheckDispatcher.java @@ -87,6 +87,7 @@ public class CheckDispatcher { private String host = null; private String login = null; private String password = null; + private Integer ssl = 0; private volatile ConcurrentHashMap filter = new ConcurrentHashMap(); @@ -135,10 +136,11 @@ public class CheckDispatcher { } } - public CheckDispatcher(final String host, final String login, final String password) { + public CheckDispatcher(final String host, final String login, final String password, final Integer ssl) { this.host = host; this.login = login; this.password = password; + this.ssl = ssl; this.executorGlobal = new ThreadPoolExecutorPostFilter(5, 10, Conf.workerQueueTimeout, TimeUnit.MILLISECONDS, new LinkedBlockingQueue()); @@ -165,6 +167,10 @@ public class CheckDispatcher { return this.password; } + public Integer getSsl() { + return this.ssl; + } + public synchronized void dispatch(final NetworkClient client) { if (this.filter.containsKey(client.getRawRequest())) { @@ -190,52 +196,52 @@ public class CheckDispatcher { public ICommandHandler getCommandHandler() throws AS400SecurityException, IOException { if (this.commandHandler == null) { - this.commandHandler = new CommandHandler(this.host, this.login, this.password); + this.commandHandler = new CommandHandler(this.host, this.login, this.password, this.ssl); } return this.commandHandler; } public IDiskHandler getDiskHandler() throws AS400SecurityException, IOException { if (this.diskHandler == null) { - this.diskHandler = new DiskHandler(this.host, this.login, this.password); + this.diskHandler = new DiskHandler(this.host, this.login, this.password, this.ssl); } return this.diskHandler; } public IJobHandler getJobHandler() throws AS400SecurityException, IOException { if (this.jobHandler == null) { - this.jobHandler = new JobHandler(this.host, this.login, this.password); + this.jobHandler = new JobHandler(this.host, this.login, this.password, this.ssl); } return this.jobHandler; } public ISubSystemHandler getSubSystemHandler() throws AS400SecurityException, IOException { if (this.subSystemHandler == null) { - this.subSystemHandler = new SubSystemHandler(this.host, this.login, this.password); + this.subSystemHandler = new SubSystemHandler(this.host, this.login, this.password, this.ssl); } return this.subSystemHandler; } public ISystemHandler getSystemHandler() throws AS400SecurityException, IOException { if (this.systemHandler == null) { - this.systemHandler = new SystemHandler(this.host, this.login, this.password); + this.systemHandler = new SystemHandler(this.host, this.login, this.password, this.ssl); } return this.systemHandler; } public ICachedMessageQueueHandler getCachedMessageQueueHandler() throws AS400SecurityException, IOException { - return new CachedMessageQueueHandler(this.host, this.login, this.password); + return new CachedMessageQueueHandler(this.host, this.login, this.password, this.ssl); } public IMessageQueueHandler getMessageQueueHandler() throws AS400SecurityException, IOException { - return new MessageQueueHandler(this.host, this.login, this.password); + return new MessageQueueHandler(this.host, this.login, this.password, this.ssl); } public IJobQueueHandler getJobQueueHandler() throws AS400SecurityException, IOException { - return new JobQueueHandler(this.host, this.login, this.password); + return new JobQueueHandler(this.host, this.login, this.password, this.ssl); } public WorkWithProblemHandler getWrkPrbHandler() throws AS400SecurityException, IOException { - return new WorkWithProblemHandler(this.host, this.login, this.password); + return new WorkWithProblemHandler(this.host, this.login, this.password, this.ssl); } } diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/check/InputData.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/check/InputData.java index 61916b6c8..1d30ff483 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/check/InputData.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/check/InputData.java @@ -31,6 +31,7 @@ public class InputData { private String password = null; private String host = null; private String command = null; + private Integer ssl = null; Map args = null; public InputData() { @@ -44,6 +45,13 @@ public class InputData { return this.password; } + public Integer getSsl() { + if (this.ssl == null || this.ssl == 0) { + return 0; + } + return 1; + } + public String getHost() { return this.host; } diff --git a/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/client/impl/ClientDispatcherImpl.java b/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/client/impl/ClientDispatcherImpl.java index 5fa0b5ca1..868414d08 100644 --- a/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/client/impl/ClientDispatcherImpl.java +++ b/as400/connector.as400/src/main/java/com/centreon/connector/as400/dispatcher/client/impl/ClientDispatcherImpl.java @@ -52,37 +52,37 @@ public class ClientDispatcherImpl implements ClientDispatcher { } private synchronized CheckDispatcher createNewCheckDispatcher(final String host, final String login, - final String password) throws AS400SecurityException, IOException, DelayedConnectionException, Exception { + final String password, final Integer ssl) throws AS400SecurityException, IOException, DelayedConnectionException, Exception { ConnectorLogger.getInstance().info("create new As400 : " + host); CheckDispatcher resource = null; - resource = new CheckDispatcher(host, login, password); + resource = new CheckDispatcher(host, login, password, ssl); this.pool.put(resource, System.currentTimeMillis()); return resource; } - private CheckDispatcher getAs400(final String host, final String login, final String password) + private CheckDispatcher getAs400(final String host, final String login, final String password, final Integer ssl) throws AS400SecurityException, IOException, DelayedConnectionException, Exception { for (final CheckDispatcher resource : this.pool.keySet()) { if (resource.getHost().equalsIgnoreCase(host) && resource.getLogin().equalsIgnoreCase(login) - && resource.getPassword().equalsIgnoreCase(password)) { + && resource.getPassword().equalsIgnoreCase(password) && resource.getSsl() == ssl) { this.pool.put(resource, System.currentTimeMillis()); return resource; } } - return this.createNewCheckDispatcher(host, login, password); + return this.createNewCheckDispatcher(host, login, password, ssl); } @Override public synchronized void dispatch(final NetworkClient client) throws AS400SecurityException, IOException, DelayedConnectionException, Exception { final CheckDispatcher checkDispatcher = this.getAs400(client.getAs400Host(), client.getAs400Login(), - client.getAs400Password()); + client.getAs400Password(), client.getAs400Ssl()); checkDispatcher.dispatch(client); } } diff --git a/as400/connector.as400/src/test/java/com/centreon/connector/as400/check/handler/impl/SystemHandlerTest.java b/as400/connector.as400/src/test/java/com/centreon/connector/as400/check/handler/impl/SystemHandlerTest.java index 9139082be..95bc2ceec 100644 --- a/as400/connector.as400/src/test/java/com/centreon/connector/as400/check/handler/impl/SystemHandlerTest.java +++ b/as400/connector.as400/src/test/java/com/centreon/connector/as400/check/handler/impl/SystemHandlerTest.java @@ -35,7 +35,7 @@ public class SystemHandlerTest { try { SystemStatus as400 = mock(SystemStatus.class); when(as400.getSystemPools()).thenReturn(new Vector().elements()); - SystemHandler sh = new SystemHandler(null, null, null, as400); + SystemHandler sh = new SystemHandler(null, null, null, as400, null); sh.dumpSystem(); } finally { System.setOut(originalOut); diff --git a/src/os/as400/connector/custom/api.pm b/src/os/as400/connector/custom/api.pm index 620fed2f1..252cb0b74 100644 --- a/src/os/as400/connector/custom/api.pm +++ b/src/os/as400/connector/custom/api.pm @@ -53,7 +53,8 @@ sub new { 'critical-http-status:s' => { name => 'critical_http_status' }, 'as400-hostname:s' => { name => 'as400_hostname' }, 'as400-username:s' => { name => 'as400_username' }, - 'as400-password:s' => { name => 'as400_password' } + 'as400-password:s' => { name => 'as400_password' }, + 'as400-ssl' => { name => 'as400_ssl' } }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -87,6 +88,7 @@ sub check_options { $self->{as400_hostname} = (defined($self->{option_results}->{as400_hostname})) ? $self->{option_results}->{as400_hostname} : ''; $self->{as400_username} = (defined($self->{option_results}->{as400_username})) ? $self->{option_results}->{as400_username} : ''; $self->{as400_password} = (defined($self->{option_results}->{as400_password})) ? $self->{option_results}->{as400_password} : ''; + $self->{as400_ssl} = (defined($self->{option_results}->{as400_ssl})) ? 1 : 0; if ($self->{connector_hostname} eq '') { $self->{output}->add_option_msg(short_msg => "Need to specify --connector-hostname option."); @@ -152,6 +154,7 @@ sub request_api { host => $self->{as400_hostname}, login => $self->{as400_username}, password => $self->{as400_password}, + ssl => $self->{as400_ssl}, command => $options{command} }; if (defined($options{args})) { @@ -247,6 +250,10 @@ AS/400 username (required) AS/400 password (required) +=item B<--as400-ssl> + +Use SSL connection (port: 9475) + =back =head1 DESCRIPTION diff --git a/tests/resources/spellcheck/stopwords.txt b/tests/resources/spellcheck/stopwords.txt index 3bf3214e1..c188d0893 100644 --- a/tests/resources/spellcheck/stopwords.txt +++ b/tests/resources/spellcheck/stopwords.txt @@ -24,6 +24,7 @@ api.meraki.com --api-username --api-version AppearTV +AS400 ASAM Avigilon Avocent