apache
/
eventmesh
4
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

订阅端acl12

This commit is contained in:
拍拍 2023-03-09 14:49:37 +08:00
parent d0cc6f797e
commit 30cf6c2bae
6 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eventmesh-connector-plugin/eventmesh-connector-pulsar/src/main/java/org/apache/eventmesh/connector/pulsar/consumer/PulsarConsumerImpl.java
View File

@ -59,7 +59,6 @@ public class PulsarConsumerImpl implements Consumer {
private final AtomicBoolean started = new AtomicBoolean(false);
private Properties properties;
private PulsarClient pulsarClient;
private org.apache.pulsar.client.api.Consumer<byte[]> consumer;
private EventListener eventListener;
private ConcurrentHashMap<String, org.apache.pulsar.client.api.Consumer<byte[]>> consumerMap = new ConcurrentHashMap<>();

2
eventmesh-registry-plugin/eventmesh-registry-consul/src/main/java/org/apache/eventmesh/registry/consul/service/ConsulRegistryService.java
View File

@ -19,8 +19,8 @@ package org.apache.eventmesh.registry.consul.service;
import org.apache.eventmesh.api.exception.RegistryException;
import org.apache.eventmesh.api.registry.RegistryService;
import org.apache.eventmesh.api.registry.bo.EventMeshServicePubTopicInfo;
import org.apache.eventmesh.api.registry.bo.EventMeshAppSubTopicInfo;
import org.apache.eventmesh.api.registry.bo.EventMeshServicePubTopicInfo;
import org.apache.eventmesh.api.registry.dto.EventMeshDataInfo;
import org.apache.eventmesh.api.registry.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.registry.dto.EventMeshUnRegisterInfo;

3
eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdCustomService.java
View File

@ -18,8 +18,8 @@
package org.apache.eventmesh.registry.etcd.service;
import org.apache.eventmesh.api.exception.RegistryException;
import org.apache.eventmesh.api.registry.bo.EventMeshServicePubTopicInfo;
import org.apache.eventmesh.api.registry.bo.EventMeshAppSubTopicInfo;
import org.apache.eventmesh.api.registry.bo.EventMeshServicePubTopicInfo;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.utils.JsonUtils;
import org.apache.eventmesh.registry.etcd.constant.EtcdConstant;
@ -75,6 +75,7 @@ public class EtcdCustomService extends EtcdRegistryService {
return null;
}
@Nullable
public EventMeshAppSubTopicInfo findEventMeshAppSubTopicInfoByGroup(String group) throws RegistryException {
Client client = getEtcdClient();

56
eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/acl/Acl.java
View File

@ -105,24 +105,6 @@ public class Acl {
aclService.doAclCheckInSend(buildTcpAclProperties(remoteAddr, userAgent, topic, requestCode));
}
public void doAclCheckInTcpReceive(String remoteAddr, UserAgent userAgent, String topic, int requestCode) throws AclException {
aclService.doAclCheckInReceive(buildTcpAclProperties(remoteAddr, userAgent, topic, requestCode));
}
private static AclProperties buildTcpAclProperties(String remoteAddr, UserAgent userAgent, String topic, int requestCode) {
AclProperties aclProperties = new AclProperties();
aclProperties.setClientIp(remoteAddr);
aclProperties.setUser(userAgent.getUsername());
aclProperties.setPwd(userAgent.getPassword());
aclProperties.setSubsystem(userAgent.getSubsystem());
aclProperties.setRequestCode(requestCode);
if (StringUtils.isNotBlank(topic)) {
aclProperties.setTopic(topic);
}
return aclProperties;
}
public void doAclCheckInHttpSend(String remoteAddr, String user, String pass, String subsystem, String topic, int requestCode)
throws AclException {
aclService.doAclCheckInSend(buildHttpAclProperties(remoteAddr, user, pass, subsystem, topic, requestCode));
@ -188,6 +170,25 @@ public class Acl {
return aclProperties;
}
private AclProperties buildHttpAclProperties(String remoteAddr, String token, String subsystem, String topic, String requestURI, Object obj) {
AclProperties aclProperties = new AclProperties();
aclProperties.setClientIp(remoteAddr);
aclProperties.setSubsystem(subsystem);
aclProperties.setRequestURI(requestURI);
if (StringUtils.isNotBlank(token)) {
aclProperties.setToken(token);
}
if (StringUtils.isNotBlank(topic)) {
aclProperties.setTopic(topic);
}
if (obj instanceof EventMeshServicePubTopicInfo) {
aclProperties.setExtendedField("group", ((EventMeshServicePubTopicInfo) obj).getService());
aclProperties.setExtendedField("topics", ((EventMeshServicePubTopicInfo) obj).getTopics());
}
return aclProperties;
}
private static AclProperties buildTcpAclProperties(String remoteAddr, UserAgent userAgent, String topic, int requestCode) {
AclProperties aclProperties = new AclProperties();
aclProperties.setClientIp(remoteAddr);
@ -233,23 +234,4 @@ public class Acl {
return aclProperties;
}
private AclProperties buildHttpAclProperties(String remoteAddr, String token, String subsystem, String topic, String requestURI, Object obj) {
AclProperties aclProperties = new AclProperties();
aclProperties.setClientIp(remoteAddr);
aclProperties.setSubsystem(subsystem);
aclProperties.setRequestURI(requestURI);
if (StringUtils.isNotBlank(token)) {
aclProperties.setToken(token);
}
if (StringUtils.isNotBlank(topic)) {
aclProperties.setTopic(topic);
}
if (obj instanceof EventMeshServicePubTopicInfo) {
aclProperties.setExtendedField("group", ((EventMeshServicePubTopicInfo) obj).getService());
aclProperties.setExtendedField("topics", ((EventMeshServicePubTopicInfo) obj).getTopics());
}
return aclProperties;
}
}

1
eventmesh-security-plugin/eventmesh-security-auth-token/src/main/java/org/apache/eventmesh/auth/token/impl/AuthTokenServiceImpl.java
View File

@ -40,7 +40,6 @@ public class AuthTokenServiceImpl implements AclService {
@Override
public void doAclCheckInConnect(AclProperties aclProperties) throws AclException {
AuthTokenUtils.authTokenByPublicKey(aclProperties);
AuthTokenUtils.helloTaskAuthTokenByPublicKey(aclProperties);
}

3
eventmesh-security-plugin/eventmesh-security-auth-token/src/main/java/org/apache/eventmesh/auth/token/impl/auth/AuthTokenUtils.java
View File

@ -35,7 +35,6 @@ import java.security.spec.X509EncodedKeySpec;
import java.util.Set;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jws;
import io.jsonwebtoken.Jwt;
import io.jsonwebtoken.JwtException;
import io.jsonwebtoken.JwtParser;
@ -72,7 +71,6 @@ public class AuthTokenUtils {
Key validationKey = kf.generatePublic(spec);
JwtParser signedParser = Jwts.parserBuilder().setSigningKey(validationKey).build();
Jwt<?, Claims> signJwt = signedParser.parseClaimsJws(token);
Jws<Claims> signJwt = signedParser.parseClaimsJws(token);
String sub = signJwt.getBody().get("sub", String.class);
if (!sub.contains(aclProperties.getExtendedField("group").toString()) && !sub.contains("pulsar-admin")) {
throw new AclException("group:" + aclProperties.getExtendedField("group ") + " has no auth to access eventMesh:"
@ -89,7 +87,6 @@ public class AuthTokenUtils {
}
} else {
throw new AclException("invalid token!");
{
throw new AclException("invalid token!");
}