Skip to content

make web session key more versatile #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imay merged 1 commit into from
Sep 19, 2017
Merged

make web session key more versatile #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions fe/src/com/baidu/palo/http/HttpAuthManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class HttpAuthManager {
private static long SESSION_EXPIRE_TIME = 2; // hour
private static long SESSION_MAX_SIZE = 100; // avoid to store too many

private static HttpAuthManager instance = null;
private static HttpAuthManager instance = new HttpAuthManager();

// session_id => username
private Cache<String, String> authSessions = CacheBuilder.newBuilder()
Expand All @@ -39,9 +39,6 @@ private HttpAuthManager() {
}

public static HttpAuthManager getInstance() {
if (instance == null) {
instance = new HttpAuthManager();
}
return instance;
}

Expand Down
23 changes: 10 additions & 13 deletions fe/src/com/baidu/palo/http/action/WebBaseAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@

package com.baidu.palo.http.action;

import java.net.InetSocketAddress;
import java.util.Date;
import java.util.List;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import com.baidu.palo.common.AnalysisException;
import com.baidu.palo.common.Config;
import com.baidu.palo.common.DdlException;
Expand All @@ -33,13 +26,21 @@
import com.baidu.palo.http.BaseResponse;
import com.baidu.palo.http.HttpAuthManager;
import com.baidu.palo.http.rest.RestBaseResult;

import com.google.common.base.Strings;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import io.netty.handler.codec.http.DefaultCookie;
import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.HttpMethod;
import io.netty.handler.codec.http.HttpResponseStatus;

import java.net.InetSocketAddress;
import java.util.List;
import java.util.UUID;

public class WebBaseAction extends BaseAction {
private static final Logger LOG = LogManager.getLogger(WebBaseAction.class);
private static final String ADMIN_USER = "root";
Expand Down Expand Up @@ -118,7 +119,6 @@ public void execute(BaseRequest request, BaseResponse response) {
} else if (method.equals(HttpMethod.POST)) {
executePost(request, response);
} else {

response.appendContent(new RestBaseResult("HTTP method is not allowed.").toJson());
writeResponse(request, response, HttpResponseStatus.METHOD_NOT_ALLOWED);
}
Expand Down Expand Up @@ -150,7 +150,7 @@ protected boolean checkAuth(BaseRequest request, BaseResponse response) {
return true;
} catch (DdlException e) {
response.appendContent("Authentication Failed. <br/> "
+ "You can only access test <a href=\"/help\">'/help'</a> page without login!");
+ "You can only access <a href=\"/help\">'/help'</a> page without login!");
writeAuthResponse(request, response);
return false;
}
Expand Down Expand Up @@ -196,9 +196,7 @@ protected void addSession(BaseRequest request, BaseResponse response, String val
// We use hashcode of client's IP and timestamp, which not only can identify users from
// different host machine, but also can improve the difficulty of forging cookie.
int clientAddrHashCode = ((InetSocketAddress) request.getContext().channel().remoteAddress()).hashCode();
String key = String.valueOf(clientAddrHashCode)
+ "_"
+ String.valueOf(new Date().getTime());
String key = UUID.randomUUID().toString();
DefaultCookie cookie = new DefaultCookie(PALO_SESSION_ID, key);
cookie.setMaxAge(PALO_SESSION_EXPIRED_TIME);
response.addCookie(cookie);
Expand Down Expand Up @@ -333,4 +331,3 @@ public static NotFoundAction getNotFoundAction() {
return NOT_FOUND_ACTION;
}
}