gCubeSystem
/
my-vres
16
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

my-vres

This commit is contained in:
Massimiliano Assante 2019-09-17 17:55:53 +02:00
parent 7ad9ab3f43
commit 18a451138f
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distro/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.portlet.user.my-vres.2-6-0"
date="2019-09-17">
<Change>It provides part of the gcube oAuth2 service with capability to be deployed on a multi instance cluster, it no longer posts the temporary code to the oAuth service, it places it in the memcahced cluster.</Change>
</Changeset>
<Changeset component="org.gcube.portlet.user.my-vres.2-5-0" <Changeset component="org.gcube.portlet.user.my-vres.2-5-0"
date="2017-11-03"> date="2017-11-03">
<Change>Ported to GWT 2.8.1 <Change>Ported to GWT 2.8.1

6
src/main/java/org/gcube/portlet/user/my_vres/server/DistributedCacheClient.java
View File

@ -3,7 +3,6 @@ package org.gcube.portlet.user.my_vres.server;
import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; import static org.gcube.resources.discovery.icclient.ICFactory.clientFor;
import static org.gcube.resources.discovery.icclient.ICFactory.queryFor; import static org.gcube.resources.discovery.icclient.ICFactory.queryFor;
import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -17,6 +16,7 @@ import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.SimpleQuery; import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import net.spy.memcached.KetamaConnectionFactory;
import net.spy.memcached.MemcachedClient; import net.spy.memcached.MemcachedClient;
/** /**
@ -43,8 +43,8 @@ public class DistributedCacheClient {
private DistributedCacheClient(){ private DistributedCacheClient(){
List<InetSocketAddress> addrs = discoverHostOfServiceEndpoint(); List<InetSocketAddress> addrs = discoverHostOfServiceEndpoint();
try { try {
mClient = new MemcachedClient(addrs); mClient = new MemcachedClient(new KetamaConnectionFactory(), addrs);
} catch (IOException e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }

15
src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java
View File

@ -36,6 +36,7 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet;
import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil;
import net.spy.memcached.MemcachedClient; import net.spy.memcached.MemcachedClient;
import net.spy.memcached.internal.OperationFuture;
/** /**
* The server side implementation of the RPC service. * The server side implementation of the RPC service.
@ -45,9 +46,7 @@ import net.spy.memcached.MemcachedClient;
public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsService { public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsService {
private static final Logger _log = LoggerFactory.getLogger(MyVREsServiceImpl.class); private static final Logger _log = LoggerFactory.getLogger(MyVREsServiceImpl.class);
/**
*
*/
public static final String CACHED_VOS = "CACHED_VRES"; public static final String CACHED_VOS = "CACHED_VRES";
/** /**
* needed when querying for authorised services in authentication * needed when querying for authorised services in authentication
@ -96,7 +95,6 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer
LinkedHashMap<String, ArrayList<VRE>> toReturn = new LinkedHashMap<String, ArrayList<VRE>>(); LinkedHashMap<String, ArrayList<VRE>> toReturn = new LinkedHashMap<String, ArrayList<VRE>>();
List<VirtualGroup> currentSiteVGroups = gm.getVirtualGroups(ManagementUtils.getSiteGroupIdFromServletRequest(getThreadLocalRequest().getServerName())); List<VirtualGroup> currentSiteVGroups = gm.getVirtualGroups(ManagementUtils.getSiteGroupIdFromServletRequest(getThreadLocalRequest().getServerName()));
for (VirtualGroup vg : currentSiteVGroups) { for (VirtualGroup vg : currentSiteVGroups) {
String gName = vg.getName(); String gName = vg.getName();
@ -349,6 +347,7 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private boolean authorizeApplication(String infrastructureName, String qToken, String tempCode, String clientId, String redirectURL) { private boolean authorizeApplication(String infrastructureName, String qToken, String tempCode, String clientId, String redirectURL) {
OperationFuture<Boolean> writeOp = null;
try { try {
//instance the client if first time //instance the client if first time
if (entries == null) if (entries == null)
@ -361,12 +360,14 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer
object.put("redirect_uri", redirectURL); object.put("redirect_uri", redirectURL);
object.put("client_id", clientId); object.put("client_id", clientId);
String JSONData = object.toJSONString(); String JSONData = object.toJSONString();
entries.set(tempCode, CACHE_SECONDS_EXPIRATION, JSONData); writeOp = entries.set(tempCode, CACHE_SECONDS_EXPIRATION, JSONData);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return false; return writeOp.getStatus().isSuccess();
} }
return true; return writeOp.getStatus().isSuccess();
} }