You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/21 06:41:43 UTC
[shardingsphere-elasticjob] branch master updated: Remove useless
class (#1214)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new b34e071 Remove useless class (#1214)
b34e071 is described below
commit b34e0712e3b7c03b91351f2d9cde5c9ba2bac4ef
Author: Liang Zhang <te...@163.com>
AuthorDate: Tue Jul 21 14:41:37 2020 +0800
Remove useless class (#1214)
* Remove useless class
* Remove useless codes
---
.../elasticjob/cloud/security/WwwAuthFilter.java | 123 ---------------------
.../elasticjob/reg/exception/RegException.java | 4 -
2 files changed, 127 deletions(-)
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/security/WwwAuthFilter.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/security/WwwAuthFilter.java
deleted file mode 100755
index eff0629..0000000
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/security/WwwAuthFilter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.shardingsphere.elasticjob.cloud.security;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
-
-/**
- * WWW auth filter.
- */
-@Slf4j
-public final class WwwAuthFilter implements Filter {
-
- private static final String FILE_SEPARATOR = System.getProperty("file.separator");
-
- private static final String AUTH_PREFIX = "Basic ";
-
- private static final String ROOT_IDENTIFY = "root";
-
- private static final String ROOT_DEFAULT_USERNAME = "root";
-
- private static final String ROOT_DEFAULT_PASSWORD = "root";
-
- private static final String GUEST_IDENTIFY = "guest";
-
- private static final String GUEST_DEFAULT_USERNAME = "guest";
-
- private static final String GUEST_DEFAULT_PASSWORD = "guest";
-
- private String rootUsername;
-
- private String rootPassword;
-
- private String guestUsername;
-
- private String guestPassword;
-
- @Override
- public void init(final FilterConfig filterConfig) {
- Properties props = new Properties();
- URL classLoaderURL = Thread.currentThread().getContextClassLoader().getResource("");
- if (null != classLoaderURL) {
- String configFilePath = String.join(FILE_SEPARATOR, classLoaderURL.getPath(), "conf", "auth.properties");
- try {
- props.load(new FileInputStream(configFilePath));
- } catch (final IOException ex) {
- log.warn("Cannot found auth config file, use default auth config.");
- }
- }
- rootUsername = props.getProperty("root.username", ROOT_DEFAULT_USERNAME);
- rootPassword = props.getProperty("root.password", ROOT_DEFAULT_PASSWORD);
- guestUsername = props.getProperty("guest.username", GUEST_DEFAULT_USERNAME);
- guestPassword = props.getProperty("guest.password", GUEST_DEFAULT_PASSWORD);
- }
-
- @Override
- public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException, ServletException {
- HttpServletRequest httpRequest = (HttpServletRequest) request;
- HttpServletResponse httpResponse = (HttpServletResponse) response;
- String authorization = httpRequest.getHeader("authorization");
- if (null != authorization && authorization.length() > AUTH_PREFIX.length()) {
- authorization = authorization.substring(AUTH_PREFIX.length(), authorization.length());
- if ((rootUsername + ":" + rootPassword).equals(new String(Base64.decodeBase64(authorization)))) {
- authenticateSuccess(httpResponse, false);
- chain.doFilter(httpRequest, httpResponse);
- } else if ((guestUsername + ":" + guestPassword).equals(new String(Base64.decodeBase64(authorization)))) {
- authenticateSuccess(httpResponse, true);
- chain.doFilter(httpRequest, httpResponse);
- } else {
- needAuthenticate(httpResponse);
- }
- } else {
- needAuthenticate(httpResponse);
- }
- }
-
- private void authenticateSuccess(final HttpServletResponse response, final boolean isGuest) {
- response.setStatus(200);
- response.setHeader("Pragma", "No-cache");
- response.setHeader("Cache-Control", "no-store");
- response.setDateHeader("Expires", 0);
- response.setHeader("identify", isGuest ? GUEST_IDENTIFY : ROOT_IDENTIFY);
- }
-
- private void needAuthenticate(final HttpServletResponse response) {
- response.setStatus(401);
- response.setHeader("Cache-Control", "no-store");
- response.setDateHeader("Expires", 0);
- response.setHeader("WWW-authenticate", AUTH_PREFIX + "Realm=\"Elastic Job Console Auth\"");
- }
-
- @Override
- public void destroy() {
- }
-}
diff --git a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java b/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
index 3797feb..1254f91 100644
--- a/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
+++ b/elasticjob-infra/elasticjob-registry-center/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
@@ -24,10 +24,6 @@ public final class RegException extends RuntimeException {
private static final long serialVersionUID = -6417179023552012152L;
- public RegException(final String errorMessage, final Object... args) {
- super(String.format(errorMessage, args));
- }
-
public RegException(final Exception cause) {
super(cause);
}