REPO-4859 : HTTP_UNAUTHORIZED instead of HTTP_FORBIDDEN for some CMIS apis

- moved the fix to a more suitable place
    - added explanatory comment

(cherry picked from commit a219162 master to 6.2.N)
This commit is contained in:
Lucian Tuca
2020-04-30 15:15:16 +03:00
committed by tzclucian
parent 273f68ef0a
commit 59cb203762

View File

@@ -23,21 +23,23 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package org.alfresco.opencmis; package org.alfresco.opencmis;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.apache.chemistry.opencmis.commons.server.CallContext;
public class PublicApiCallContextHandler extends BasicAuthCallContextHandler import org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler;
{
private static final long serialVersionUID = 8877878113507734452L; public class PublicApiCallContextHandler extends BasicAuthCallContextHandler
{
@Override private static final long serialVersionUID = 8877878113507734452L;
public Map<String, String> getCallContextMap(HttpServletRequest request)
@Override
public Map<String, String> getCallContextMap(HttpServletRequest request)
{ {
Map<String, String> map = new HashMap<String, String>(); Map<String, String> map = new HashMap<String, String>();
@@ -46,8 +48,17 @@ public class PublicApiCallContextHandler extends BasicAuthCallContextHandler
{ {
map.putAll(basicAuthMap); map.putAll(basicAuthMap);
} }
map.put("isPublicApi", "true"); // Adding the username in the context is needed because of the following reasons:
return map; // - CMISServletDispatcher is configured to ALWAYS use this class (PublicApiCallContextHandler)
} // - this class extends the BasicAuthCallContextHandler class which only puts the username in the context ONLY IF the request is having Basic auth
} // - therefor in the case of a Bearer auth, the username is never in the context, fact that ultimately leads to bugs when the response should be provided
if (map.get(CallContext.USERNAME) == null && AuthenticationUtil.getFullyAuthenticatedUser() != null)
{
map.put(CallContext.USERNAME, AuthenticationUtil.getFullyAuthenticatedUser());
}
map.put("isPublicApi", "true");
return map;
}
}