From bca4e34b512e5b3935ffd41c94d14b95100d898c Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Tue, 12 Jul 2016 00:31:52 -0700
Subject: [PATCH] GUACAMOLE-5: Provide UserContext to
 DirectoryObjectResourceFactory, in case needed by a particular resource (such
 as for additional permission checks).

---
 .../rest/directory/DirectoryObjectResourceFactory.java     | 7 ++++++-
 .../apache/guacamole/rest/directory/DirectoryResource.java | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectResourceFactory.java b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectResourceFactory.java
index ba173828d..613ac4220 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectResourceFactory.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryObjectResourceFactory.java
@@ -21,6 +21,7 @@ package org.apache.guacamole.rest.directory;
 
 import org.apache.guacamole.net.auth.Directory;
 import org.apache.guacamole.net.auth.Identifiable;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * Factory which creates DirectoryObjectResource instances exposing objects of
@@ -40,6 +41,9 @@ public interface DirectoryObjectResourceFactory<InternalType extends Identifiabl
     /**
      * Creates a new DirectoryObjectResource which exposes the given object.
      *
+     * @param userContext
+     *     The UserContext which contains the given Directory.
+     *
      * @param directory
      *     The Directory which contains the object being exposed.
      *
@@ -51,6 +55,7 @@ public interface DirectoryObjectResourceFactory<InternalType extends Identifiabl
      *     A new DirectoryObjectResource which exposes the given object.
      */
     DirectoryObjectResource<InternalType, ExternalType>
-        create(Directory<InternalType> directory, InternalType object);
+        create(UserContext userContext, Directory<InternalType> directory,
+                InternalType object);
 
 }
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
index 5f726f60c..ee4fd2c73 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
@@ -258,7 +258,7 @@ public class DirectoryResource<InternalType extends Identifiable, ExternalType>
             throw new GuacamoleResourceNotFoundException("Not found: \"" + identifier + "\"");
 
         // Return a resource which provides access to the retrieved object
-        return resourceFactory.create(directory, object);
+        return resourceFactory.create(userContext, directory, object);
 
     }