[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98798289
--- Diff: extensions/guacamole-auth-http/src/main/assembly/dist.xml ---
@@ -0,0 +1,53 @@
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+
+dist
+${project.artifactId}-${project.version}
+
+
+
+tar.gz
+
+
+
+
+
+
+
+
+src/licenses
--- End diff --
To clarify, the licenses I refer to above are the contents of the
`src/licenses/` directory (as well as `DISCLAIMER` and `NOTICE`), which is
absent here. Unlike the top-level license which you needed to remove
previously, these licenses are what apply to the bundled `.tar.gz` produced by
the build.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98798013
--- Diff: extensions/guacamole-auth-http/src/main/assembly/dist.xml ---
@@ -0,0 +1,53 @@
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+
+dist
+${project.artifactId}-${project.version}
+
+
+
+tar.gz
+
+
+
+
+
+
+
+
+src/licenses
--- End diff --
In order for the licenses to be included (and they need to be), they need
to be part of the source tree. Here things are simpler, since this extension
isn't bundling anything which hasn't already been bundled by other extensions,
so the burden of research is lessened. The contents of the `src/licenses/`
directory for guacamole-auth-ldap is probably the best reference:
https://github.com/apache/incubator-guacamole-client/tree/d358449c7f1592e6b06aadc94dcf39dcc50c9671/extensions/guacamole-auth-ldap/src/licenses
I think your extension has the exact same dependencies (with the exception
of jldap, of course).
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98510072
--- Diff:
extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java
---
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.guacamole.auth.http;
+
+import com.google.inject.Inject;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+
+/**
+ * Service for retrieving configuration information regarding the LDAP
server.
+ *
+ * @author Nick Couchman
+ */
+public class ConfigurationService {
+
+/**
+ * The Guacamole server environment.
+ */
+@Inject
+private Environment environment;
+
+/**
+ * Returns the header of the HTTP server as configured with
+ * guacamole.properties used for HTTP basic authentication.
--- End diff --
Removed the word basic from these comments.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user necouchman commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98508560 --- Diff: extensions/guacamole-auth-http/README.md --- @@ -0,0 +1,2 @@ +# guacamole-auth-http +Basic HTTP Authentication Module for Guacamole --- End diff -- Removed. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user necouchman commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98508324 --- Diff: extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java --- @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2015 Glyptodon LLC --- End diff -- Fixed. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98508351
--- Diff:
extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java
---
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.guacamole.auth.http;
+
+import com.google.inject.Inject;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+
+/**
+ * Service for retrieving configuration information regarding the LDAP
server.
+ *
+ * @author Nick Couchman
+ */
+public class ConfigurationService {
+
+/**
+ * The Guacamole server environment.
+ */
+@Inject
+private Environment environment;
+
+/**
+ * Returns the header of the HTTP server as configured with
+ * guacamole.properties used for HTTP basic authentication.
--- End diff --
Is it correct to refer to this as HTTP basic authentication?
The header may come from something that performs HTTP basic auth, but the
extension itself isn't doing that. It's just consuming an arbitrary header, the
default header `REMOTE_USER` not in fact being part of HTTP basic:
https://en.wikipedia.org/wiki/Basic_access_authentication
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user necouchman commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98508373 --- Diff: extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProviderModule.java --- @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2015 Glyptodon LLC --- End diff -- Fixed. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user necouchman commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98508344 --- Diff: extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java --- @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2015 Glyptodon LLC --- End diff -- Fixed. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98507940 --- Diff: extensions/guacamole-auth-http/README.md --- @@ -0,0 +1,2 @@ +# guacamole-auth-http +Basic HTTP Authentication Module for Guacamole --- End diff -- *Probably* don't need this virtually-empty `README.md`. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98506512 --- Diff: pom.xml --- @@ -53,6 +53,7 @@ extensions/guacamole-auth-jdbc extensions/guacamole-auth-ldap extensions/guacamole-auth-noauth +extensions/guacamole-auth-http --- End diff -- Please maintain alphabetical ordering of modules within the `pom.xml`. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user necouchman commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98507747 --- Diff: extensions/guacamole-auth-http/.gitignore --- @@ -0,0 +1,9 @@ +target/ +pom.xml.tag --- End diff -- Fixed - made the contents the same as the other extensions. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user necouchman commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98507427 --- Diff: pom.xml --- @@ -53,6 +53,7 @@ extensions/guacamole-auth-jdbc extensions/guacamole-auth-ldap extensions/guacamole-auth-noauth +extensions/guacamole-auth-http --- End diff -- Reordered. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98507296 --- Diff: extensions/guacamole-auth-http/.gitignore --- @@ -0,0 +1,9 @@ +target/ +pom.xml.tag --- End diff -- So ... what are all these files being ignored? A typical `.gitignore` just contains: target/ *~ Though even that is probably not necessary due to the top-level `.gitignore` of guacamole-client. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user necouchman commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98507215 --- Diff: extensions/guacamole-auth-http/LICENSE --- @@ -0,0 +1,201 @@ + Apache License --- End diff -- Removed. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98506934
--- Diff: extensions/guacamole-auth-http/src/main/assembly/dist.xml ---
@@ -0,0 +1,53 @@
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+
+dist
+${project.artifactId}-${project.version}
+
+
+
+tar.gz
+
+
+
+
+
+
+
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98506836 --- Diff: extensions/guacamole-auth-http/LICENSE --- @@ -0,0 +1,201 @@ + Apache License --- End diff -- While there does need to be a copy of the Apache License included in the `.tar.gz` bundle (see the packaging of the other extensions), there shouldn't be a top-level copy. The guacamole-client source must have exactly one top-level `LICENSE` file, and that's already present. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98506283 --- Diff: extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java --- @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2015 Glyptodon LLC --- End diff -- Same thing here - the license boilerplate for the guac codebase is different now. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98506405 --- Diff: extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java --- @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2015 Glyptodon LLC --- End diff -- You probably get the idea. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98506340 --- Diff: extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProviderModule.java --- @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2015 Glyptodon LLC --- End diff -- Aand here. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request: https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98506122 --- Diff: extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java --- @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2015 Glyptodon LLC --- End diff -- If copying the `AuthenticationProviderService` from something else, should probably copy the Apache-licensed one. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/incubator-guacamole-client/pull/111#discussion_r98505915
--- Diff: extensions/guacamole-auth-http/src/main/assembly/dist.xml ---
@@ -0,0 +1,53 @@
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+
+dist
+${project.artifactId}-${project.version}
+
+
+
+tar.gz
+
+
+
+
+
+
+
[GitHub] incubator-guacamole-client pull request #111: GUACAMOLE-29: Add module to su...
GitHub user necouchman opened a pull request: https://github.com/apache/incubator-guacamole-client/pull/111 GUACAMOLE-29: Add module to support HTTP header-based authentication. New pull request to merge in the new guacamole-auth-http module. You can merge this pull request into a Git repository by running: $ git pull https://github.com/necouchman/incubator-guacamole-client GUACAMOLE-29 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-guacamole-client/pull/111.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 #111 commit 1cc7d06ef379748560a785f057a2a00d25c1c92e Author: Nick Couchman Date: 2017-01-25T19:00:04Z GUACAMOLE-29: Add module to support HTTP header-based authentication. --- 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 [email protected] or file a JIRA ticket with INFRA. ---
