X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fnetconf%2Fnetconf-ssh%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fssh%2Fosgi%2FNetconfSSHActivator.java;fp=opendaylight%2Fnetconf%2Fnetconf-ssh%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fssh%2Fosgi%2FNetconfSSHActivator.java;h=d74308cfadbae8e658e58f9b189d93baaea83c2e;hb=c6ab5fdef3d0cc6fac96cb960839168ed7906b3a;hp=ca0c9454d4a5c8934a96da245b41029198e464d6;hpb=aefe82b158bc1694fe633053d04f2364bcbe67d9;p=controller.git diff --git a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/osgi/NetconfSSHActivator.java b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/osgi/NetconfSSHActivator.java index ca0c9454d4..d74308cfad 100644 --- a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/osgi/NetconfSSHActivator.java +++ b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/osgi/NetconfSSHActivator.java @@ -7,22 +7,19 @@ */ package org.opendaylight.controller.netconf.ssh.osgi; -import com.google.common.base.Optional; +import static com.google.common.base.Preconditions.checkNotNull; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.net.InetSocketAddress; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.opendaylight.controller.netconf.ssh.NetconfSSHServer; import org.opendaylight.controller.netconf.ssh.authentication.AuthProvider; import org.opendaylight.controller.netconf.ssh.authentication.PEMGenerator; import org.opendaylight.controller.netconf.util.osgi.NetconfConfigUtil; -import org.opendaylight.controller.sal.authorization.UserLevel; import org.opendaylight.controller.usermanager.IUserManager; -import org.opendaylight.controller.usermanager.UserConfig; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -30,7 +27,6 @@ import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.google.common.base.Preconditions.checkNotNull; /** * Activator for netconf SSH bundle which creates SSH bridge between netconf client and netconf server. Activator @@ -46,31 +42,28 @@ public class NetconfSSHActivator implements BundleActivator{ private NetconfSSHServer server; private static final Logger logger = LoggerFactory.getLogger(NetconfSSHActivator.class); - private static final String EXCEPTION_MESSAGE = "Netconf ssh bridge is not available."; private IUserManager iUserManager; private BundleContext context = null; - private Optional defaultPassword; - private Optional defaultUser; private ServiceTrackerCustomizer customizer = new ServiceTrackerCustomizer(){ @Override - public IUserManager addingService(ServiceReference reference) { + public IUserManager addingService(final ServiceReference reference) { logger.trace("Service {} added, let there be SSH bridge.", reference); iUserManager = context.getService(reference); try { onUserManagerFound(iUserManager); - } catch (Exception e) { + } catch (final Exception e) { logger.trace("Can't start SSH server due to {}",e); } return iUserManager; } @Override - public void modifiedService(ServiceReference reference, IUserManager service) { + public void modifiedService(final ServiceReference reference, final IUserManager service) { logger.trace("Replacing modified service {} in netconf SSH.", reference); server.addUserManagerService(service); } @Override - public void removedService(ServiceReference reference, IUserManager service) { + public void removedService(final ServiceReference reference, final IUserManager service) { logger.trace("Removing service {} from netconf SSH. " + "SSH won't authenticate users until IUserManager service will be started.", reference); removeUserManagerService(); @@ -79,80 +72,61 @@ public class NetconfSSHActivator implements BundleActivator{ @Override - public void start(BundleContext context) { + public void start(final BundleContext context) { this.context = context; listenForManagerService(); } @Override public void stop(BundleContext context) throws IOException { - if (this.defaultUser.isPresent()){ - this.iUserManager.removeLocalUser(this.defaultUser.get()); - } if (server != null){ server.stop(); logger.trace("Netconf SSH bridge is down ..."); } } - private void startSSHServer() throws IllegalStateException, IOException { + private void startSSHServer() throws IOException { checkNotNull(this.iUserManager, "No user manager service available."); logger.trace("Starting netconf SSH bridge."); - Optional sshSocketAddressOptional = NetconfConfigUtil.extractSSHNetconfAddress(context, EXCEPTION_MESSAGE); - InetSocketAddress tcpSocketAddress = NetconfConfigUtil.extractTCPNetconfAddress(context, - EXCEPTION_MESSAGE, true); + final InetSocketAddress sshSocketAddress = NetconfConfigUtil.extractSSHNetconfAddress(context, + NetconfConfigUtil.DEFAULT_NETCONF_SSH_ADDRESS); + final InetSocketAddress tcpSocketAddress = NetconfConfigUtil.extractTCPNetconfClientAddress(context, + NetconfConfigUtil.DEFAULT_NETCONF_TCP_ADDRESS); - if (sshSocketAddressOptional.isPresent()){ - String path = FilenameUtils.separatorsToSystem(NetconfConfigUtil.getPrivateKeyPath(context)); - if (path.equals("")){ - throw new IllegalStateException("Missing netconf.ssh.pk.path key in configuration file."); - } + String path = FilenameUtils.separatorsToSystem(NetconfConfigUtil.getPrivateKeyPath(context)); - File privateKeyFile = new File(path); - String privateKeyPEMString = null; - if (privateKeyFile.exists() == false) { - try { - privateKeyPEMString = PEMGenerator.generateTo(privateKeyFile); - } catch (Exception e) { - logger.error("Exception occurred while generating PEM string {}",e); - } - } else { - // read from file - try (FileInputStream fis = new FileInputStream(path)) { - privateKeyPEMString = IOUtils.toString(fis); - } catch (IOException e) { - logger.error("Error reading RSA key from file '{}'", path); - throw new IllegalStateException("Error reading RSA key from file " + path); - } - } - AuthProvider authProvider = null; + if (path.isEmpty()) { + throw new IllegalStateException("Missing netconf.ssh.pk.path key in configuration file."); + } + + final File privateKeyFile = new File(path); + final String privateKeyPEMString; + if (privateKeyFile.exists() == false) { + // generate & save to file try { - this.defaultPassword = NetconfConfigUtil.getSSHDefaultPassword(context); - this.defaultUser = NetconfConfigUtil.getSSHDefaultUser(context); - // Since there is no user data store yet (ldap, ...) this adds default user/password to UserManager - // if these parameters are set in netconf configuration file. - if (defaultUser.isPresent() && - defaultPassword.isPresent()){ - logger.trace(String.format("Default username and password for netconf ssh bridge found. Adding user %s to user manager.",defaultUser.get())); - List roles = new ArrayList(1); - roles.add(UserLevel.SYSTEMADMIN.toString()); - iUserManager.addLocalUser(new UserConfig(defaultUser.get(), defaultPassword.get(), roles)); - } - authProvider = new AuthProvider(iUserManager, privateKeyPEMString); + privateKeyPEMString = PEMGenerator.generateTo(privateKeyFile); } catch (Exception e) { - logger.error("Error instantiating AuthProvider {}",e); + logger.error("Exception occurred while generating PEM string {}", e); + throw new IllegalStateException("Error generating RSA key from file " + path); } - this.server = NetconfSSHServer.start(sshSocketAddressOptional.get().getPort(),tcpSocketAddress,authProvider); - - Thread serverThread = new Thread(server,"netconf SSH server thread"); - serverThread.setDaemon(true); - serverThread.start(); - logger.trace("Netconf SSH bridge up and running."); } else { - logger.trace("No valid connection configuration for SSH bridge found."); - throw new IllegalStateException("No valid connection configuration for SSH bridge found."); + // read from file + try (FileInputStream fis = new FileInputStream(path)) { + privateKeyPEMString = IOUtils.toString(fis); + } catch (final IOException e) { + logger.error("Error reading RSA key from file '{}'", path); + throw new IOException("Error reading RSA key from file " + path, e); + } } + final AuthProvider authProvider = new AuthProvider(iUserManager, privateKeyPEMString); + this.server = NetconfSSHServer.start(sshSocketAddress.getPort(), tcpSocketAddress, authProvider); + + final Thread serverThread = new Thread(server, "netconf SSH server thread"); + serverThread.setDaemon(true); + serverThread.start(); + logger.trace("Netconf SSH bridge up and running."); } - private void onUserManagerFound(IUserManager userManager) throws IOException { + + private void onUserManagerFound(final IUserManager userManager) throws Exception{ if (server!=null && server.isUp()){ server.addUserManagerService(userManager); } else { @@ -163,7 +137,7 @@ public class NetconfSSHActivator implements BundleActivator{ this.server.removeUserManagerService(); } private void listenForManagerService(){ - ServiceTracker listenerTracker = new ServiceTracker<>(context, IUserManager.class,customizer); + final ServiceTracker listenerTracker = new ServiceTracker<>(context, IUserManager.class,customizer); listenerTracker.open(); } }