You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@guacamole.apache.org by GitBox <gi...@apache.org> on 2020/06/29 11:54:24 UTC
[GitHub] [guacamole-client] necouchman opened a new pull request #543: GUACAMOLE-944: Allow search bind usernames in non-DN format.
necouchman opened a new pull request #543:
URL: https://github.com/apache/guacamole-client/pull/543
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] mike-jumper commented on a change in pull request #543: GUACAMOLE-944: Allow search bind usernames in non-DN format.
Posted by GitBox <gi...@apache.org>.
mike-jumper commented on a change in pull request #543:
URL: https://github.com/apache/guacamole-client/pull/543#discussion_r637508219
##########
File path: extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/LdapBindGuacamoleProperty.java
##########
@@ -0,0 +1,61 @@
+/*
+ * 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.ldap.conf;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.properties.GuacamoleProperty;
+
+/**
+ * A GuacamoleProperty that checks a string to a verify that it is a valid
+ * LDAP bind format - either an Active Directory UPN or a LDAP DN. An exception
+ * is thrown if the provided value is invalid.
+ */
+public abstract class LdapBindGuacamoleProperty implements GuacamoleProperty<String> {
+
+ /**
+ * An expression that matches valid Active Directory UPN values, in one of
+ * three formats - <DOMAIN>\<USERNAME>, <USERNAME>@<DOMAIN> or <USERNAME>
+ */
+ private static final Pattern LDAP_UPN_PATTERN = Pattern.compile("^(?:(?<adusername>)([^@]+(?<addomain>.*))|(?<nbdomain>[^\\\\]+)\\\\(?<nbusername>.+))$");
Review comment:
I've been playing around with this regex and various test strings, and the regex itself is actually pretty broad. The documentation for the regex sets an honorable goal, but the only strings that will not match this are strings that start with "@" but do not end with "\something".
Checking [Microsoft's documentation for the UPN](https://docs.microsoft.com/en-us/windows/win32/adschema/a-userprincipalname), it's clear that there is an intent for the value to follow a specific format ("based on" RFC 822 and "should" be the user's email address), but there is no apparent hard requirement except that it must be a Unicode string.
Also, while Active Directory may specifically allow username-style binds driven by `userPrincipalName`, I'm not sure this goes for other LDAP server implementations that may have their own definitions for what usernames can be used in lieu of an FQDN.
I think we should probably stick to a plain `StringGuacamoleProperty`...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on a change in pull request #543: GUACAMOLE-944: Allow search bind usernames in non-DN format.
Posted by GitBox <gi...@apache.org>.
necouchman commented on a change in pull request #543:
URL: https://github.com/apache/guacamole-client/pull/543#discussion_r642129225
##########
File path: extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/LdapBindGuacamoleProperty.java
##########
@@ -0,0 +1,61 @@
+/*
+ * 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.ldap.conf;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.properties.GuacamoleProperty;
+
+/**
+ * A GuacamoleProperty that checks a string to a verify that it is a valid
+ * LDAP bind format - either an Active Directory UPN or a LDAP DN. An exception
+ * is thrown if the provided value is invalid.
+ */
+public abstract class LdapBindGuacamoleProperty implements GuacamoleProperty<String> {
+
+ /**
+ * An expression that matches valid Active Directory UPN values, in one of
+ * three formats - <DOMAIN>\<USERNAME>, <USERNAME>@<DOMAIN> or <USERNAME>
+ */
+ private static final Pattern LDAP_UPN_PATTERN = Pattern.compile("^(?:(?<adusername>)([^@]+(?<addomain>.*))|(?<nbdomain>[^\\\\]+)\\\\(?<nbusername>.+))$");
Review comment:
Yeah, that makes sense. I've reverted it to just a `StringGuacamoleProperty`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] mike-jumper merged pull request #543: GUACAMOLE-944: Allow search bind usernames in non-DN format.
Posted by GitBox <gi...@apache.org>.
mike-jumper merged pull request #543:
URL: https://github.com/apache/guacamole-client/pull/543
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on a change in pull request #543: GUACAMOLE-944: Allow search bind usernames in non-DN format.
Posted by GitBox <gi...@apache.org>.
necouchman commented on a change in pull request #543:
URL: https://github.com/apache/guacamole-client/pull/543#discussion_r632109572
##########
File path: extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/LdapBindGuacamoleProperty.java
##########
@@ -0,0 +1,61 @@
+/*
+ * 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.ldap.conf;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.properties.GuacamoleProperty;
+
+/**
+ * A GuacamoleProperty that checks a string to a verify that it is a valid
+ * LDAP bind format - either an Active Directory UPN or a LDAP DN. An exception
+ * is thrown if the provided value is invalid.
+ */
+public abstract class LdapBindGuacamoleProperty implements GuacamoleProperty<String> {
+
+ /**
+ * An expression that matches valid Active Directory UPN values, in one of
+ * two formats - either <DOMAIN>\<USERNAME> or <USERNAME>@<DOMAIN>.
+ */
+ private static final Pattern LDAP_UPN_PATTERN = Pattern.compile("^(?:(?<adusername>[^@]+)@(?<addomain>.+)|(?<nbdomain>[^\\\\]+)\\\\(?<nbusername>.+))$");
Review comment:
Okay, I _think_ I've managed to do this...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] mike-jumper commented on a change in pull request #543: GUACAMOLE-944: Allow search bind usernames in non-DN format.
Posted by GitBox <gi...@apache.org>.
mike-jumper commented on a change in pull request #543:
URL: https://github.com/apache/guacamole-client/pull/543#discussion_r579766796
##########
File path: extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/LdapBindGuacamoleProperty.java
##########
@@ -0,0 +1,61 @@
+/*
+ * 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.ldap.conf;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.properties.GuacamoleProperty;
+
+/**
+ * A GuacamoleProperty that checks a string to a verify that it is a valid
+ * LDAP bind format - either an Active Directory UPN or a LDAP DN. An exception
+ * is thrown if the provided value is invalid.
+ */
+public abstract class LdapBindGuacamoleProperty implements GuacamoleProperty<String> {
+
+ /**
+ * An expression that matches valid Active Directory UPN values, in one of
+ * two formats - either <DOMAIN>\<USERNAME> or <USERNAME>@<DOMAIN>.
+ */
+ private static final Pattern LDAP_UPN_PATTERN = Pattern.compile("^(?:(?<adusername>[^@]+)@(?<addomain>.+)|(?<nbdomain>[^\\\\]+)\\\\(?<nbusername>.+))$");
Review comment:
Should a simple domain-less username be accepted?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on a change in pull request #543: GUACAMOLE-944: Allow search bind usernames in non-DN format.
Posted by GitBox <gi...@apache.org>.
necouchman commented on a change in pull request #543:
URL: https://github.com/apache/guacamole-client/pull/543#discussion_r632100810
##########
File path: extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/LdapBindGuacamoleProperty.java
##########
@@ -0,0 +1,61 @@
+/*
+ * 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.ldap.conf;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.properties.GuacamoleProperty;
+
+/**
+ * A GuacamoleProperty that checks a string to a verify that it is a valid
+ * LDAP bind format - either an Active Directory UPN or a LDAP DN. An exception
+ * is thrown if the provided value is invalid.
+ */
+public abstract class LdapBindGuacamoleProperty implements GuacamoleProperty<String> {
+
+ /**
+ * An expression that matches valid Active Directory UPN values, in one of
+ * two formats - either <DOMAIN>\<USERNAME> or <USERNAME>@<DOMAIN>.
+ */
+ private static final Pattern LDAP_UPN_PATTERN = Pattern.compile("^(?:(?<adusername>[^@]+)@(?<addomain>.+)|(?<nbdomain>[^\\\\]+)\\\\(?<nbusername>.+))$");
Review comment:
Yeah, I guess we should allow that, too...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org