nutch-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewismc <...@git.apache.org>
Subject [GitHub] nutch pull request #128: NUTCH-2289 SSL support for Nutch 2.X REST API.
Date Mon, 27 Jun 2016 18:31:13 GMT
Github user lewismc commented on a diff in the pull request:

    https://github.com/apache/nutch/pull/128#discussion_r68630587
  
    --- Diff: src/java/org/apache/nutch/api/NutchServer.java ---
    @@ -99,17 +114,70 @@ public NutchServer() {
         component = new Component();
         component.getLogger().setLevel(Level.parse(logLevel));
     
    -    // Add a new HTTP server listening on defined port.
    -    component.getServers().add(Protocol.HTTP, port);
    +    AuthenticationTypeEnum authenticationType = configManager.get(ConfigResource.DEFAULT)
    +            .getEnum("restapi.auth", AuthenticationTypeEnum.NONE);
    +
    +    if (authenticationType == AuthenticationTypeEnum.SSL) {
    +      // Add a new HTTPS server listening on defined port.
    +      Server server = component.getServers().add(Protocol.HTTPS, port);
    +
    +      Series parameters = server.getContext().getParameters();
    +      parameters.add("sslContextFactory", "org.restlet.engine.ssl.DefaultSslContextFactory");
    +
    +      String keyStorePath = configManager.get(ConfigResource.DEFAULT)
    +              .get("restapi.auth.ssl.storepath", "etc/nutch-ssl.keystore.jks");
    +      parameters.add("keyStorePath", keyStorePath);
    +
    +      String keyStorePassword = configManager.get(ConfigResource.DEFAULT)
    +              .get("restapi.auth.ssl.storepass", "password");
    +      parameters.add("keyStorePassword", keyStorePassword);
    +
    +      String keyPassword = configManager.get(ConfigResource.DEFAULT)
    +              .get("restapi.auth.ssl.keypass", "password");
    +      parameters.add("keyPassword", keyPassword);
    +
    +      parameters.add("keyStoreType", "JKS");
    +      LOG.info("SSL Authentication is set for NutchServer");
    +    } else {
    +      // Add a new HTTP server listening on defined port.
    +      component.getServers().add(Protocol.HTTP, port);
    +    }
     
         Context childContext = component.getContext().createChildContext();
         JaxRsApplication application = new JaxRsApplication(childContext);
         application.add(this);
         application.setStatusService(new ErrorStatusService());
         childContext.getAttributes().put(NUTCH_SERVER, this);
     
    -    // Attach the application.
    -    component.getDefaultHost().attach(application);
    +    if (authenticationType == AuthenticationTypeEnum.NONE || authenticationType == AuthenticationTypeEnum.SSL
) {
    +      component.getDefaultHost().attach(application);
    +      return;
    +    }
    +
    +    String username = configManager.get(ConfigResource.DEFAULT).get("restapi.auth.username",
"admin");
    +    String password = configManager.get(ConfigResource.DEFAULT).get("restapi.auth.password",
"nutch");
    +
    +    MapVerifier mapVerifier = new MapVerifier();
    +    mapVerifier.getLocalSecrets().put(username, password.toCharArray());
    +
    +    if (authenticationType == AuthenticationTypeEnum.BASIC) {
    --- End diff --
    
    Please see comment on other issue for use of switch block.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message