inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-1394: Discovery: merge back to 5.2.N (from feature branch)

Browse Source 
Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      130980 jkaabimofrad: REPO-224: API for retrieving detailed repository information.
   Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      131056 jkaabimofrad: REPO-224: Removed "transformationServerExpiresAt" attribute from the license JSON response as it is not part of AC.
   Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      131179 jkaabimofrad: REPO-224: Modified the license's entitlement response to always return "isClusterEnabled" and "isCryptodocEnabled".

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Cristian Turlica
2016-10-12 05:14:58 +00:00
parent 4d5b8671fb
commit 3f6a5d9e81
10 changed files with 1135 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
source/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRequest.java
View File

@@ -1,28 +1,28 @@
/*
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
/*
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rest.api;
import javax.servlet.http.HttpServletRequest;
@@ -35,42 +35,49 @@ import org.springframework.extensions.webscripts.Runtime;
public class PublicApiTenantWebScriptServletRequest extends TenantWebScriptServletRequest
{
public static final String NETWORKS_PATH = "networks";
public static final String NETWORK_PATH = "network";
public PublicApiTenantWebScriptServletRequest(Runtime container, HttpServletRequest req, Match serviceMatch, ServerProperties serverProperties)
{
super(container, req, serviceMatch, serverProperties);
}
public static final String NETWORKS_PATH = "networks";
public static final String NETWORK_PATH = "network";
@Override
public PublicApiTenantWebScriptServletRequest(Runtime container, HttpServletRequest req, Match serviceMatch, ServerProperties serverProperties)
{
super(container, req, serviceMatch, serverProperties);
}
@Override
protected void parse()
{
String realPathInfo = getRealPathInfo();
if(realPathInfo.equals("") || realPathInfo.equals("/"))
{
// no tenant - "index" request
tenant = TenantUtil.DEFAULT_TENANT;
// no tenant - "index" request
tenant = TenantUtil.DEFAULT_TENANT;
pathInfo = NETWORKS_PATH;
}
else if (realPathInfo.equals("/discovery"))
{
// The '/discovery' API is special and doesn't need network info, however,
// we set the tenant to default, to satisfy PublicApiTenantAuthentication logic.
tenant = TenantUtil.DEFAULT_TENANT;
pathInfo = realPathInfo;
}
else
{
// optimisation - don't need to lowercase the whole path
if(realPathInfo.substring(0, 5).toLowerCase().equals("/cmis"))
{
// cmis service document, pass through as is and set tenant to "-default-".
tenant = TenantUtil.DEFAULT_TENANT;
// optimisation - don't need to lowercase the whole path
if(realPathInfo.substring(0, 5).toLowerCase().equals("/cmis"))
{
// cmis service document, pass through as is and set tenant to "-default-".
tenant = TenantUtil.DEFAULT_TENANT;
pathInfo = realPathInfo;
}
else
{
}
else
{
int idx = realPathInfo.indexOf('/', 1);
// remove tenant
tenant = realPathInfo.substring(1, idx == -1 ? realPathInfo.length() : idx);
pathInfo = realPathInfo.substring(tenant.length() + 1);
}
// remove tenant
tenant = realPathInfo.substring(1, idx == -1 ? realPathInfo.length() : idx);
pathInfo = realPathInfo.substring(tenant.length() + 1);
}
}
}
}