Merge branch 'master' of https://code-repo.d4science.org/gCubeSystem/common-smartgears.git
This commit is contained in:
commit
e8a32631f2
|
@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Fabio Simeoni
|
* @author Fabio Simeoni
|
||||||
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*/
|
*/
|
||||||
public class BridgedApplicationConfiguration implements ApplicationConfiguration {
|
public class BridgedApplicationConfiguration implements ApplicationConfiguration {
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ import org.gcube.smartgears.persistence.Persistence;
|
||||||
* Includes the list of its client services.
|
* Includes the list of its client services.
|
||||||
*
|
*
|
||||||
* @author Fabio Simeoni
|
* @author Fabio Simeoni
|
||||||
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@XmlRootElement(name="application")
|
@XmlRootElement(name="application")
|
||||||
|
|
|
@ -32,7 +32,7 @@ import org.gcube.smartgears.persistence.Persistence;
|
||||||
* The configuration of the container.
|
* The configuration of the container.
|
||||||
*
|
*
|
||||||
* @author Fabio Simeoni
|
* @author Fabio Simeoni
|
||||||
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*/
|
*/
|
||||||
@XmlRootElement(name="container")
|
@XmlRootElement(name="container")
|
||||||
public class ContainerConfiguration {
|
public class ContainerConfiguration {
|
||||||
|
|
|
@ -98,10 +98,9 @@ public class RequestValidator extends RequestHandler {
|
||||||
|
|
||||||
if (token == null && scope==null){
|
if (token == null && scope==null){
|
||||||
log.warn("rejecting call to {}, authorization required",context.name(),token);
|
log.warn("rejecting call to {}, authorization required",context.name(),token);
|
||||||
if (call.context().container().configuration().authenticationEnpoint()==null){
|
//if (call.context().container().configuration().authenticationEnpoint()==null){
|
||||||
log.warn("rejecting call to {}, authorization required",context.name(),token);
|
|
||||||
RequestError.request_not_authorized_error.fire(context.name()+": authorization required");
|
RequestError.request_not_authorized_error.fire(context.name()+": authorization required");
|
||||||
}else {
|
/*}else {
|
||||||
log.info("authorization enpoint found on configuration, redirecting the call");
|
log.info("authorization enpoint found on configuration, redirecting the call");
|
||||||
String recallLocation = String.format("http://%s:%d%s", call.context().container().configuration().hostname(), call.context().container().configuration().port(), call.uri());
|
String recallLocation = String.format("http://%s:%d%s", call.context().container().configuration().hostname(), call.context().container().configuration().port(), call.uri());
|
||||||
//call.response().setHeader("Allowed-Contexts", call.context().container().configuration().allowedContexts().toString());
|
//call.response().setHeader("Allowed-Contexts", call.context().container().configuration().allowedContexts().toString());
|
||||||
|
@ -110,7 +109,7 @@ public class RequestValidator extends RequestHandler {
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.error("errror redirecting call",e );
|
log.error("errror redirecting call",e );
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*/
|
*/
|
||||||
@XmlRootElement(name = accounting_management)
|
@XmlRootElement(name = accounting_management)
|
||||||
public class AccountingManager extends ContainerHandler {
|
public class AccountingManager extends ContainerHandler {
|
||||||
|
|
|
@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Fabio Simeoni
|
* @author Fabio Simeoni
|
||||||
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
|
* @author Luca Frosini (ISTI - CNR)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class ProfileBuilder {
|
public class ProfileBuilder {
|
||||||
|
|
Loading…
Reference in New Issue