Skip to content

Commit 0c0f3ac

Browse files
committed
Use java.util.Base64 for decoding.
Reverted application.properties. Add maven wrapper.
1 parent 1d54d4d commit 0c0f3ac

4 files changed

Lines changed: 552 additions & 351 deletions

File tree

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip

mvnw

Lines changed: 259 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/org/ohdsi/webapi/shiro/filters/auth/KerberosAuthFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
package org.ohdsi.webapi.shiro.filters.auth;
2020

21-
import com.sun.org.apache.xml.internal.security.utils.Base64;
21+
import java.util.Base64;
2222
import jakarta.servlet.ServletRequest;
2323
import jakarta.servlet.ServletResponse;
2424
import jakarta.servlet.http.HttpServletRequest;
@@ -44,7 +44,7 @@ protected AuthenticationToken createToken(ServletRequest servletRequest, Servlet
4444
AuthenticationToken authToken = null;
4545

4646
if (authHeader != null) {
47-
byte[] token = Base64.decode(authHeader.replaceAll("^Negotiate ", ""));
47+
byte[] token = Base64.getDecoder().decode(authHeader.replaceAll("^Negotiate ", ""));
4848
authToken = new SpnegoToken(token);
4949
}
5050

0 commit comments

Comments
 (0)