@ -146,7 +146,7 @@ public class RenderResource {
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
Security . requirePriorAuthorization ( request , signature , Service . WEBSITE , null ) ;
Security . requirePriorAuthorization ( request , signature , Service . WEBSITE , null ) ;
return this . get ( signature , ResourceIdType . SIGNATURE , null , "/" , null , "/render/signature" , true , true , theme ) ;
return this . get ( signature , ResourceIdType . SIGNATURE , null , null , "/" , null , "/render/signature" , true , true , theme ) ;
}
}
@GET
@GET
@ -157,7 +157,7 @@ public class RenderResource {
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
Security . requirePriorAuthorization ( request , signature , Service . WEBSITE , null ) ;
Security . requirePriorAuthorization ( request , signature , Service . WEBSITE , null ) ;
return this . get ( signature , ResourceIdType . SIGNATURE , null , inPath , null , "/render/signature" , true , true , theme ) ;
return this . get ( signature , ResourceIdType . SIGNATURE , null , null , inPath , null , "/render/signature" , true , true , theme ) ;
}
}
@GET
@GET
@ -168,7 +168,7 @@ public class RenderResource {
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
Security . requirePriorAuthorization ( request , hash58 , Service . WEBSITE , null ) ;
Security . requirePriorAuthorization ( request , hash58 , Service . WEBSITE , null ) ;
return this . get ( hash58 , ResourceIdType . FILE_HASH , Service . WEBSITE , "/" , secret58 , "/render/hash" , true , false , theme ) ;
return this . get ( hash58 , ResourceIdType . FILE_HASH , Service . WEBSITE , null , "/" , secret58 , "/render/hash" , true , false , theme ) ;
}
}
@GET
@GET
@ -180,7 +180,7 @@ public class RenderResource {
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
Security . requirePriorAuthorization ( request , hash58 , Service . WEBSITE , null ) ;
Security . requirePriorAuthorization ( request , hash58 , Service . WEBSITE , null ) ;
return this . get ( hash58 , ResourceIdType . FILE_HASH , Service . WEBSITE , inPath , secret58 , "/render/hash" , true , false , theme ) ;
return this . get ( hash58 , ResourceIdType . FILE_HASH , Service . WEBSITE , null , inPath , secret58 , "/render/hash" , true , false , theme ) ;
}
}
@GET
@GET
@ -189,12 +189,13 @@ public class RenderResource {
public HttpServletResponse getPathByName ( @PathParam ( "service" ) Service service ,
public HttpServletResponse getPathByName ( @PathParam ( "service" ) Service service ,
@PathParam ( "name" ) String name ,
@PathParam ( "name" ) String name ,
@PathParam ( "path" ) String inPath ,
@PathParam ( "path" ) String inPath ,
@QueryParam ( "identifier" ) String identifier ,
@QueryParam ( "theme" ) String theme ) {
@QueryParam ( "theme" ) String theme ) {
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
if ( ! Settings . getInstance ( ) . isQDNAuthBypassEnabled ( ) )
Security . requirePriorAuthorization ( request , name , service , null ) ;
Security . requirePriorAuthorization ( request , name , service , null ) ;
String prefix = String . format ( "/render/%s" , service ) ;
String prefix = String . format ( "/render/%s" , service ) ;
return this . get ( name , ResourceIdType . NAME , service , inPath , null , prefix , true , true , theme ) ;
return this . get ( name , ResourceIdType . NAME , service , identifier , i nPath , null , prefix , true , true , theme ) ;
}
}
@GET
@GET
@ -207,15 +208,15 @@ public class RenderResource {
Security . requirePriorAuthorization ( request , name , service , null ) ;
Security . requirePriorAuthorization ( request , name , service , null ) ;
String prefix = String . format ( "/render/%s" , service ) ;
String prefix = String . format ( "/render/%s" , service ) ;
return this . get ( name , ResourceIdType . NAME , service , "/" , null , prefix , true , true , theme ) ;
return this . get ( name , ResourceIdType . NAME , service , null , "/" , null , prefix , true , true , theme ) ;
}
}
private HttpServletResponse get ( String resourceId , ResourceIdType resourceIdType , Service service , String inPath ,
private HttpServletResponse get ( String resourceId , ResourceIdType resourceIdType , Service service , String identifier ,
String secret58 , String prefix , boolean usePrefix , boolean async , String theme ) {
String inPath , String secret58 , String prefix , boolean usePrefix , boolean async , String theme ) {
ArbitraryDataRenderer renderer = new ArbitraryDataRenderer ( resourceId , resourceIdType , service , inPath ,
ArbitraryDataRenderer renderer = new ArbitraryDataRenderer ( resourceId , resourceIdType , service , identifier , i nPath ,
secret58 , prefix , usePrefix , async , "render" , request , response , context ) ;
secret58 , prefix , usePrefix , async , "render" , request , response , context ) ;
if ( theme ! = null ) {
if ( theme ! = null ) {