[GitHub] nutch pull request #136: NUTCH-2289 SSL support for Nutch 2.X REST API.

2016-07-14 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/nutch/pull/136


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] nutch pull request #136: NUTCH-2289 SSL support for Nutch 2.X REST API.

2016-07-14 Thread kamaci 
Github user kamaci commented on a diff in the pull request:

https://github.com/apache/nutch/pull/136#discussion_r70873672
  
--- Diff: src/java/org/apache/nutch/api/NutchServer.java ---
@@ -113,19 +114,43 @@ 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);
 
-AuthenticationTypeEnum authenticationType = 
configManager.get(ConfigResource.DEFAULT).getEnum("restapi.auth", 
AuthenticationTypeEnum.NONE);
-
 switch (authenticationType) {
   case NONE:
+  case SSL:
 // Attach the application without security
--- End diff --

@lewismc I've removed unnecessary comment.


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] nutch pull request #136: NUTCH-2289 SSL support for Nutch 2.X REST API.

2016-07-13 Thread lewismc 
Github user lewismc commented on a diff in the pull request:

https://github.com/apache/nutch/pull/136#discussion_r70727192
  
--- Diff: src/java/org/apache/nutch/api/NutchServer.java ---
@@ -113,19 +114,43 @@ 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);
 
-AuthenticationTypeEnum authenticationType = 
configManager.get(ConfigResource.DEFAULT).getEnum("restapi.auth", 
AuthenticationTypeEnum.NONE);
-
 switch (authenticationType) {
   case NONE:
+  case SSL:
 // Attach the application without security
--- End diff --

Is this comment correct? 'Attach the application without security'???


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] nutch pull request #136: NUTCH-2289 SSL support for Nutch 2.X REST API.

2016-07-13 Thread kamaci 
GitHub user kamaci opened a pull request:

https://github.com/apache/nutch/pull/136

NUTCH-2289 SSL support for Nutch 2.X REST API.



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/kamaci/nutch NUTCH-2289-3

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/nutch/pull/136.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #136


commit cc83ecd48cc5ea97001e4948591da8e2c3e85f60
Author: Furkan KAMACI 
Date:   2016-07-13T22:20:34Z

NUTCH-2289 SSL support for Nutch 2.X REST API.




---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---