Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project improvements #2

Merged
merged 5 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 131 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,16 @@ public class ConditionalFilter implements Filter {
* This constructor is provided as an ease to write some code : since you have access to the boolean,
* you may optimise the code like this :
* <pre>
* {@code
* if (condition) {
* return delegate;
* } else {
* return new Filter() {
* @Override
* public Promise<Response, NeverThrowsException> filter(Context context, Request request, Handler handler) {
* &#64;Override
* public Promise&lt;Response, NeverThrowsException&gt; filter(Context context, Request request, Handler handler) {
* return handler.handle(context, request);
* }
* };
* }
* }
* </pre>
*
* @param delegate
Expand Down
2 changes: 1 addition & 1 deletion openig-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<groovy.version>2.4.6</groovy.version>
<h2.version>2.2.224</h2.version>
<juel.version>2.2.7</juel.version>
<logback.version>1.1.7</logback.version>
<logback.version>1.2.13</logback.version>
<restito.version>1.1.0</restito.version>
<simple-jndi.version>0.23.0</simple-jndi.version>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

/**
* This is an implementation of the {@link AsyncFunction} based on the evaluation of an {@link Expression}.
* @param <V>
*/
public class ExpressionRequestAsyncFunction<V> implements AsyncFunction<ContextAndRequest, V, Exception> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/**
* A generic base class for heaplets with automatically injected fields.
* <p>
* If the object created is an instance of {@link GenericHeapObject}, it is then
* If the object created is an instance of {@link GenericHeaplet}, it is then
* automatically injected with {@code logger} and {@code storage} objects.
*/
public abstract class GenericHeaplet implements Heaplet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public final class Keys {
public static final String SESSION_FACTORY_HEAP_KEY = "Session";

/**
* Key to retrieve an implementation of a {@link org.forgerock.util.Factory<org.forgerock.http.io.Buffer>} instance
* Key to retrieve an implementation of a {@link org.forgerock.util.Factory} instance
* from the {@link org.forgerock.openig.heap.Heap}.
*/
public static final String TEMPORARY_STORAGE_HEAP_KEY = "TemporaryStorage";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ responses.clientError=Client error responses (4xx)
responses.serverError=Server error responses (5xx)
responses.other=Responses with status code >= 600
responses.errors=An exception was thrown
responses.notHandled=Responses not handled by OpenIG
responses.notHandled=Responses not handled by Wren:IG

throughput.desc=Responses per second
throughput.mean=Mean (average) since monitoring started
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# Copyright 2016 ForgeRock AS.
#

schema.desc=Routes are configurations that you add to OpenIG to serve requests.
schema.desc=Routes are configurations that you add to Wren:IG to serve requests.

handler.desc=Reference (or inline declaration) of this route's main `Handler`: accepted incoming \
requests will be processed by this `Handler` and a `Response` will asynchronously be created.
Expand All @@ -29,7 +29,7 @@ heap-object.desc=Declaration of an object located in this route's heap. It need

heap-object-name.desc=Name of this heap object, must be unique amongst other objects declared in this heap.

heap-object-type.desc=Type of this heap object, can be a fully qualified class name or a type alias supported by OpenIG.
heap-object-type.desc=Type of this heap object, can be a fully qualified class name or a type alias supported by Wren:IG.

heap-object-config.desc=Configuration data for this heap object. The exact content/schema of this object \
depends on the declared `type` of the configured heap object.
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
#

service.title=Server Info
service.desc=Provides meta-information about the running OpenIG instance (build revision, ...)
service.desc=Provides meta-information about the running Wren:IG instance (build revision, ...)

read.desc=Returns the server meta-information
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#

info.title=Server Info
info.desc=Meta-information about the running OpenIG instance (build revision, ...)
info.desc=Meta-information about the running Wren:IG instance (build revision, ...)

info-version.desc=Server version (5.0.0, ...)
info-revision.desc=SCM revision number of the sources used to run this instance (in Git SHA-1 format)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public void onRequest() throws Exception {
public void shouldChangeUriOnRequest() throws Exception {
AssignmentFilter filter = new AssignmentFilter();
filter.addRequestBinding(LeftValueExpression.valueOf("${request.uri}", String.class),
Expression.valueOf("www.forgerock.com", String.class));
Expression.valueOf("www.wrensecurity.org", String.class));

Context context = new RootContext();
Request request = new Request();
Expand All @@ -147,7 +147,7 @@ public void shouldChangeUriOnRequest() throws Exception {
Handler chain = Handlers.chainOf(new StaticResponseHandler(Status.OK), singletonList((Filter) filter));

chain.handle(context, request).get();
assertThat(request.getUri().toString()).isEqualTo("www.forgerock.com");
assertThat(request.getUri().toString()).isEqualTo("www.wrensecurity.org");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void testRemoveHeaderFromTheResponse() throws Exception {

// Prepare a static response handler that provision a response header
final StaticResponseHandler handler = new StaticResponseHandler(Status.OK);
handler.addHeader("Location", Expression.valueOf("http://openig.forgerock.com", String.class));
handler.addHeader("Location", Expression.valueOf("http://wrenig.wrensecurity.org", String.class));

// Execute the filter
Response response = filter.filter(new RootContext(), null, handler).get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
#
# Simple test resource for the loader class
#
Welcome to OpenIG
Welcome to Wren:IG
6 changes: 1 addition & 5 deletions openig-doc/src/main/resources/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,12 @@
<body>
<section class="header">
<div class="center-header">
<img alt='ForgeRock' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKQAAAA2CAYAAABJGzIJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MzNCQjQzN0REQUFGMTFFNDgzOTVGNEQ5RDQwQzQ1QTkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MzNCQjQzN0VEQUFGMTFFNDgzOTVGNEQ5RDQwQzQ1QTkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozM0JCNDM3QkRBQUYxMUU0ODM5NUY0RDlENDBDNDVBOSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozM0JCNDM3Q0RBQUYxMUU0ODM5NUY0RDlENDBDNDVBOSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PsO3y1oAAA5/SURBVHja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'/>
<p>Welcome</p>
</div>
</section>
<section class="container">
<h1>SAMPLE APPLICATION HOME PAGE</h1>
<p>The sample application is a mockup web application for testing OpenIG configurations.</p>
<p>The sample application is a mockup web application for testing Wren:IG configurations.</p>
<br/>
<h1>REQUEST INFORMATION</h1>
<table>
Expand All @@ -113,8 +112,5 @@ <h1>REQUEST INFORMATION</h1>
</tr>
</table>
</section>
<section class="footer">
<p>Copyright &copy; 2016 ForgeRock AS. All rights reserved.</p>
</section>
</body>
</html>
4 changes: 0 additions & 4 deletions openig-doc/src/main/resources/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
<body>
<section class="header">
<div class="center-header">
<img alt='ForgeRock' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKQAAAA2CAYAAABJGzIJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MzNCQjQzN0REQUFGMTFFNDgzOTVGNEQ5RDQwQzQ1QTkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MzNCQjQzN0VEQUFGMTFFNDgzOTVGNEQ5RDQwQzQ1QTkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozM0JCNDM3QkRBQUYxMUU0ODM5NUY0RDlENDBDNDVBOSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozM0JCNDM3Q0RBQUYxMUU0ODM5NUY0RDlENDBDNDVBOSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PsO3y1oAAA5/SURBVHja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'/>
<p>Howdy, USERNAME</p>
</div>
</section>
Expand Down Expand Up @@ -116,8 +115,5 @@ <h1>REQUEST INFORMATION </h1>
</tr>
</table>
</section>
<section class="footer">
<p>Copyright &copy; 2014-2016 ForgeRock AS. All rights reserved.</p>
</section>
</body>
</html>
4 changes: 2 additions & 2 deletions openig-doc/src/main/resources/uma/alice.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ <h1>Alice (Resource Owner)</h1>
</li>

<li>
OpenIG uses the PAT to create an UMA resource set with OpenAM
to share resources according to the OpenIG UmaService configuration:
Wren:IG uses the PAT to create an UMA resource set with OpenAM
to share resources according to the Wren:IG UmaService configuration:
<ul>
<li>
Paths to protected resources match the pattern, <code>.*</code>.
Expand Down
2 changes: 1 addition & 1 deletion openig-doc/src/main/resources/uma/bob.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h1>Bob (Requesting Party)</h1>
<ol>
<li>
Bob requests the resource without authorization.
OpenIG responds with a header indicating where to authenticate,
Wren:IG responds with a header indicating where to authenticate,
and including a permission ticket.
</li>

Expand Down
Loading