mihaibudiu commented on code in PR #299:
URL: https://github.com/apache/calcite-avatica/pull/299#discussion_r2760133808
##########
core/src/main/java/org/apache/calcite/avatica/remote/AvaticaHttpClientFactoryImpl.java:
##########
@@ -131,6 +131,24 @@ public static AvaticaHttpClientFactoryImpl getInstance() {
LOG.debug("{} is not capable of kerberos authentication.", authType);
}
+ if (client instanceof BearerAuthenticateable) {
+ if (AuthenticationType.BEARER == authType) {
+ try {
+ BearerTokenProvider tokenProvider =
+ BearerTokenProviderFactory.getBearerTokenProvider(config);
+ String username = config.avaticaUser();
+ if (null == username) {
+ username = System.getProperty("user.name");
+ }
+ ((BearerAuthenticateable) client).setTokenProvider(username,
tokenProvider);
Review Comment:
can userName by null here?
The method that follows does not expect them.
##########
core/src/main/java/org/apache/calcite/avatica/remote/BearerTokenProvider.java:
##########
@@ -0,0 +1,28 @@
+/*
+ * 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.calcite.avatica.remote;
+
+import org.apache.calcite.avatica.ConnectionConfig;
+
+import java.io.IOException;
+
+public interface BearerTokenProvider {
+
+ void init(ConnectionConfig config) throws IOException;
+
+ String obtain(String username);
Review Comment:
Can you please document this method?
What is the result?
##########
core/src/main/java/org/apache/calcite/avatica/BuiltInConnectionProperty.java:
##########
@@ -137,7 +137,16 @@ public enum BuiltInConnectionProperty implements
ConnectionProperty {
* HTTP Response Timeout (socket timeout) in milliseconds.
*/
HTTP_RESPONSE_TIMEOUT("http_response_timeout",
- Type.NUMBER, Timeout.ofMinutes(3).toMilliseconds(), false);
+ Type.NUMBER, Timeout.ofMinutes(3).toMilliseconds(),
false),
+
+ /** Bearer token to use to perform Bearer authentication. */
+ BEARER_TOKEN("bearer_token", Type.STRING, null, false),
+
+ /** File containing bearer tokens to use to perform Bearer authentication. */
Review Comment:
Not obvious how the file is represented using a string, presumably it's some
kind of path or URI.
##########
core/src/main/java/org/apache/calcite/avatica/ConnectionPropertyValue.java:
##########
@@ -0,0 +1,113 @@
+/*
+ * 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.calcite.avatica;
+
+public interface ConnectionPropertyValue {
+ /**
+ * Returns the string value of this property, or null if not specified and
+ * no default.
+ */
+ String getString();
+
+ /**
+ * Returns the string value of this property, or null if not specified and
+ * no default.
+ */
+ String getString(String defaultValue);
+
+ /**
+ * Returns the int value of this property. Throws if not set and no
+ * default.
+ */
+ int getInt();
+
+ /**
+ * Returns the int value of this property. Throws if not set and no
Review Comment:
No default means defaultValue is null?
##########
core/src/test/java/org/apache/calcite/avatica/remote/BearerTokenProviderFactoryTest.java:
##########
@@ -0,0 +1,149 @@
+/*
+ * 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.calcite.avatica.remote;
+
+import org.apache.calcite.avatica.BuiltInConnectionProperty;
+import org.apache.calcite.avatica.ConnectionConfig;
+import org.apache.calcite.avatica.ConnectionConfigImpl;
+import org.apache.calcite.avatica.ConnectionProperty;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Properties;
+
+import static
org.apache.calcite.avatica.remote.BearerTokenProviderFactoryTest.TestTokenProvider.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class BearerTokenProviderFactoryTest {
Review Comment:
are all tests in this file negative?
##########
core/src/main/java/org/apache/calcite/avatica/ConnectionPropertyValue.java:
##########
@@ -0,0 +1,113 @@
+/*
+ * 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.calcite.avatica;
+
+public interface ConnectionPropertyValue {
+ /**
+ * Returns the string value of this property, or null if not specified and
+ * no default.
+ */
+ String getString();
+
+ /**
+ * Returns the string value of this property, or null if not specified and
+ * no default.
+ */
+ String getString(String defaultValue);
Review Comment:
this is the only one that never throws, why this asymmetry?
##########
core/src/main/java/org/apache/calcite/avatica/ConnectionPropertyValue.java:
##########
@@ -0,0 +1,113 @@
+/*
+ * 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.calcite.avatica;
+
+public interface ConnectionPropertyValue {
+ /**
+ * Returns the string value of this property, or null if not specified and
+ * no default.
+ */
+ String getString();
+
+ /**
+ * Returns the string value of this property, or null if not specified and
+ * no default.
+ */
+ String getString(String defaultValue);
+
+ /**
+ * Returns the int value of this property. Throws if not set and no
Review Comment:
What does "default" mean here?
Is this a per-property notion?
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
