优化文件上传的认证
This commit is contained in:
@@ -44,8 +44,8 @@ public class UploadFileAction extends Action {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getToken(int type) {
|
public static String getToken(int type, String key) {
|
||||||
String signKey = KEY + "|" + (System.currentTimeMillis()) + "|" + type;
|
String signKey = KEY + "|" + (System.currentTimeMillis()) + "|" + type + "|" + key;
|
||||||
try {
|
try {
|
||||||
return DES.encryptDES(signKey);
|
return DES.encryptDES(signKey);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -55,14 +55,17 @@ public class UploadFileAction extends Action {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int validateToken(String token) throws InvalidateTokenExecption {
|
public static int validateToken(String token, String[] fileNames) throws InvalidateTokenExecption {
|
||||||
try {
|
try {
|
||||||
String signKey = DES.decryptDES(token);
|
String signKey = DES.decryptDES(token);
|
||||||
String[] parts = signKey.split("\\|");
|
String[] parts = signKey.split("\\|");
|
||||||
if(parts.length == 3) {
|
if(parts.length >= 3) {
|
||||||
if(parts[0].equals(KEY)) {
|
if(parts[0].equals(KEY)) {
|
||||||
long timestamp = Long.parseLong(parts[1]);
|
long timestamp = Long.parseLong(parts[1]);
|
||||||
if(Math.abs(System.currentTimeMillis() - timestamp) < 2 * 60 * 60 * 1000) {
|
if(Math.abs(System.currentTimeMillis() - timestamp) < 2 * 60 * 60 * 1000) {
|
||||||
|
if(parts.length == 4) {
|
||||||
|
fileNames[0] = parts[3];
|
||||||
|
}
|
||||||
return Integer.parseInt(parts[2]);
|
return Integer.parseInt(parts[2]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -153,11 +156,14 @@ public class UploadFileAction extends Action {
|
|||||||
try {
|
try {
|
||||||
int[] bucket = new int[1];
|
int[] bucket = new int[1];
|
||||||
bucket[0] = -1;
|
bucket[0] = -1;
|
||||||
|
String[] fileNames = new String[1];
|
||||||
|
fileNames[0] = null;
|
||||||
|
|
||||||
while (decoder.hasNext()) {
|
while (decoder.hasNext()) {
|
||||||
InterfaceHttpData data = decoder.next();
|
InterfaceHttpData data = decoder.next();
|
||||||
if (data != null) {
|
if (data != null) {
|
||||||
try {
|
try {
|
||||||
if(!writeFileUploadData(data, response, requestId, isKeepAlive, bucket)) {
|
if(!writeFileUploadData(data, response, requestId, isKeepAlive, bucket, fileNames)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
@@ -173,12 +179,15 @@ public class UploadFileAction extends Action {
|
|||||||
/**
|
/**
|
||||||
* writeFileUploadData
|
* writeFileUploadData
|
||||||
*/
|
*/
|
||||||
private boolean writeFileUploadData(InterfaceHttpData data, Response response, String requestId, boolean isKeepAlive, int[] bucket) {
|
private boolean writeFileUploadData(InterfaceHttpData data, Response response, String requestId, boolean isKeepAlive, int[] bucket, String[] fileNames) {
|
||||||
try {
|
try {
|
||||||
if (data.getHttpDataType() == InterfaceHttpData.HttpDataType.FileUpload) {
|
if (data.getHttpDataType() == InterfaceHttpData.HttpDataType.FileUpload) {
|
||||||
FileUpload fileUpload = (FileUpload) data;
|
FileUpload fileUpload = (FileUpload) data;
|
||||||
|
|
||||||
String remoteFileName = fileUpload.getFilename();
|
String remoteFileName = fileUpload.getFilename();
|
||||||
|
if(fileNames[0] != null) {
|
||||||
|
remoteFileName = fileNames[0];
|
||||||
|
}
|
||||||
long remoteFileSize = fileUpload.length();
|
long remoteFileSize = fileUpload.length();
|
||||||
|
|
||||||
if(bucket[0] == -1) {
|
if(bucket[0] == -1) {
|
||||||
@@ -323,7 +332,7 @@ public class UploadFileAction extends Action {
|
|||||||
String token = attribute.getValue();
|
String token = attribute.getValue();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
bucket[0] = validateToken(token);
|
bucket[0] = validateToken(token, fileNames);
|
||||||
} catch (InvalidateTokenExecption e) {
|
} catch (InvalidateTokenExecption e) {
|
||||||
logger.error("无效的token!", e);
|
logger.error("无效的token!", e);
|
||||||
response.setStatus(HttpResponseStatus.BAD_REQUEST);
|
response.setStatus(HttpResponseStatus.BAD_REQUEST);
|
||||||
|
|||||||
@@ -18,16 +18,28 @@ import io.moquette.server.config.MediaServerConfig;
|
|||||||
import io.moquette.spi.impl.Qos1PublishHandler;
|
import io.moquette.spi.impl.Qos1PublishHandler;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
|
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.Base64;
|
||||||
|
|
||||||
import static io.moquette.server.config.MediaServerConfig.FILE_STROAGE_REMOTE_SERVER_URL;
|
import static io.moquette.server.config.MediaServerConfig.FILE_STROAGE_REMOTE_SERVER_URL;
|
||||||
|
|
||||||
@Handler("GMUT")
|
@Handler("GMUT")
|
||||||
public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTokenRequest> {
|
public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTokenRequest> {
|
||||||
@Override
|
@Override
|
||||||
public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.GetUploadTokenRequest request, Qos1PublishHandler.IMCallback callback) {
|
public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.GetUploadTokenRequest request, Qos1PublishHandler.IMCallback callback) {
|
||||||
|
String fileKey = request.getMediaPath();
|
||||||
|
if(fileKey.contains("/")) {
|
||||||
|
fileKey = fileKey.substring(fileKey.lastIndexOf("/")+1);
|
||||||
|
}
|
||||||
|
|
||||||
|
String encodedUserId = Base64.getEncoder().encodeToString(fromUser.getBytes(StandardCharsets.UTF_8)).replace("+", "-2B").replace("/", "-2F").replace("=", "-3D");
|
||||||
|
if(!fileKey.startsWith(fromUser) && !fileKey.startsWith(encodedUserId)) {
|
||||||
|
LOG.error("GetMediaUploadTokenHandler error: {}, {}", fromUser, request.getMediaPath());
|
||||||
|
return ErrorCode.ERROR_CODE_NOT_RIGHT;
|
||||||
|
}
|
||||||
|
|
||||||
int type = request.getMediaType();
|
int type = request.getMediaType();
|
||||||
|
|
||||||
String token;
|
String token;
|
||||||
|
|
||||||
WFCMessage.GetUploadTokenResult.Builder resultBuilder = WFCMessage.GetUploadTokenResult.newBuilder();
|
WFCMessage.GetUploadTokenResult.Builder resultBuilder = WFCMessage.GetUploadTokenResult.newBuilder();
|
||||||
if (MediaServerConfig.USER_QINIU) {
|
if (MediaServerConfig.USER_QINIU) {
|
||||||
Auth auth = Auth.create(MediaServerConfig.QINIU_ACCESS_KEY, MediaServerConfig.QINIU_SECRET_KEY);
|
Auth auth = Auth.create(MediaServerConfig.QINIU_ACCESS_KEY, MediaServerConfig.QINIU_SECRET_KEY);
|
||||||
@@ -93,12 +105,12 @@ public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTo
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
token = auth.uploadToken(bucketName);
|
token = auth.uploadToken(bucketName, request.getMediaPath());
|
||||||
resultBuilder.setDomain(bucketDomain)
|
resultBuilder.setDomain(bucketDomain)
|
||||||
.setServer(MediaServerConfig.QINIU_SERVER_URL);
|
.setServer(MediaServerConfig.QINIU_SERVER_URL);
|
||||||
resultBuilder.setPort(80);
|
resultBuilder.setPort(80);
|
||||||
} else {
|
} else {
|
||||||
token = UploadFileAction.getToken(type);
|
token = UploadFileAction.getToken(type, request.getMediaPath());
|
||||||
if(StringUtil.isNullOrEmpty(MediaServerConfig.FILE_STROAGE_REMOTE_SERVER_URL)) {
|
if(StringUtil.isNullOrEmpty(MediaServerConfig.FILE_STROAGE_REMOTE_SERVER_URL)) {
|
||||||
resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT);
|
resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ public class GetQiniuUploadTokenHandler extends IMHandler<Byte> {
|
|||||||
.setServer(MediaServerConfig.QINIU_SERVER_URL);
|
.setServer(MediaServerConfig.QINIU_SERVER_URL);
|
||||||
resultBuilder.setPort(80);
|
resultBuilder.setPort(80);
|
||||||
} else {
|
} else {
|
||||||
token = UploadFileAction.getToken(type);
|
token = UploadFileAction.getToken(type, null);
|
||||||
resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT)
|
resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT)
|
||||||
.setServer(MediaServerConfig.SERVER_IP);
|
.setServer(MediaServerConfig.SERVER_IP);
|
||||||
resultBuilder.setPort(MediaServerConfig.HTTP_SERVER_PORT);
|
resultBuilder.setPort(MediaServerConfig.HTTP_SERVER_PORT);
|
||||||
|
|||||||
Reference in New Issue
Block a user