Use PARENT_OVERRIDES in ACLs and inherit ACL
We now do not repeat a child's ACL when it is the same as the parent and
when they differ the child inherits from the policy. This mimics the
current connector's behavior.
diff --git a/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java b/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
index fc69aae..4cb1484 100644
--- a/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
+++ b/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
@@ -482,7 +482,7 @@
getListDocContent(request, response, listId.value);
} else {
// Assume it is a top-level site.
- getSiteDocContent(request, response, null);
+ getSiteDocContent(request, response);
}
log.exiting("SiteDataClient", "getDocContent");
}
@@ -559,18 +559,46 @@
log.exiting("SiteDataClient", "getVirtualServerDocContent");
}
- private void getSiteDocContent(Request request, Response response,
- String id) throws IOException {
+ private void getSiteDocContent(Request request, Response response)
+ throws IOException {
log.entering("SiteDataClient", "getSiteDocContent",
- new Object[] {request, response, id});
- Web w = getContentWeb(id);
+ new Object[] {request, response});
+ Web w = getContentWeb();
- List<Permission> permissions
- = w.getACL().getPermissions().getPermission();
- response.setAcl(generateAcl(permissions, LIST_ITEM_MASK)
- .setInheritanceType(Acl.InheritanceType.AND_BOTH_PERMIT)
- .setInheritFrom(siteUrl.equals(webUrl)
- ? virtualServerDocId : new DocId(siteUrl))
+ if (webUrl.endsWith("/")) {
+ throw new AssertionError();
+ }
+ int slashIndex = webUrl.lastIndexOf("/");
+ // The parentUrl is not the same as the siteUrl, since there may be
+ // multiple levels of webs.
+ String parentUrl = webUrl.substring(0, slashIndex);
+
+ boolean isSiteCollection = siteUrl.equals(webUrl);
+ final boolean includePermissions;
+
+ if (isSiteCollection) {
+ includePermissions = true;
+ } else {
+ SiteDataClient parentClient = getClientForUrl(parentUrl);
+ Web parentW = parentClient.getContentWeb();
+ String parentScopeId
+ = parentW.getMetadata().getScopeID().toLowerCase(Locale.ENGLISH);
+ String scopeId
+ = w.getMetadata().getScopeID().toLowerCase(Locale.ENGLISH);
+ includePermissions = !scopeId.equals(parentScopeId);
+ }
+
+ Acl.Builder acl;
+ if (includePermissions) {
+ List<Permission> permissions
+ = w.getACL().getPermissions().getPermission();
+ acl = generateAcl(permissions, LIST_ITEM_MASK)
+ .setInheritFrom(virtualServerDocId);
+ } else {
+ acl = new Acl.Builder().setInheritFrom(new DocId(parentUrl));
+ }
+ response.setAcl(acl
+ .setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.build());
response.setContentType("text/html");
@@ -625,12 +653,23 @@
log.entering("SiteDataClient", "getListDocContent",
new Object[] {request, response, id});
com.microsoft.schemas.sharepoint.soap.List l = getContentList(id);
+ Web w = getContentWeb();
- List<Permission> permissions
- = l.getACL().getPermissions().getPermission();
- response.setAcl(generateAcl(permissions, LIST_ITEM_MASK)
- .setInheritanceType(Acl.InheritanceType.AND_BOTH_PERMIT)
- .setInheritFrom(new DocId(webUrl))
+ String scopeId = l.getMetadata().getScopeID().toLowerCase(Locale.ENGLISH);
+ String webScopeId
+ = w.getMetadata().getScopeID().toLowerCase(Locale.ENGLISH);
+
+ Acl.Builder acl;
+ if (scopeId.equals(webScopeId)) {
+ acl = new Acl.Builder().setInheritFrom(new DocId(webUrl));
+ } else {
+ List<Permission> permissions
+ = l.getACL().getPermissions().getPermission();
+ acl = generateAcl(permissions, LIST_ITEM_MASK)
+ .setInheritFrom(virtualServerDocId);
+ }
+ response.setAcl(acl
+ .setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.build());
response.setContentType("text/html");
@@ -651,7 +690,7 @@
log.entering("SiteDataClient", "processFolder",
new Object[] {listGuid, folderPath, writer});
Paginator<ItemData> folderPaginator
- = getContentFolder(listGuid, folderPath);
+ = getContentFolderChildren(listGuid, folderPath);
writer.startSection(ObjectType.LIST_ITEM);
ItemData folder;
while ((folder = folderPaginator.next()) != null) {
@@ -844,48 +883,85 @@
= row.getAttribute(OWS_SCOPEID_ATTRIBUTE).split(";#", 2)[1];
scopeId = scopeId.toLowerCase(Locale.ENGLISH);
- List<Permission> permissions = null;
- if (i.getMetadata().getScope().getId().toLowerCase(Locale.ENGLISH)
- .equals(scopeId)) {
- // The list and item share the same scope. The scope won't always be
- // within the <xml> tag and thus we are forced to check this location as
- // well.
- permissions
- = i.getMetadata().getScope().getPermissions().getPermission();
+ DocId parentDocId;
+ boolean listIsParent;
+ String parentScopeId;
+ {
+ String rawFileDirRef = row.getAttribute(OWS_FILEDIRREF_ATTRIBUTE);
+ // This should be in the form of "1234;#site/list/path". We want to
+ // extract the site/list/path. Path relative to host, even though it
+ // doesn't have a leading '/'.
+ DocId folderDocId = encodeDocId("/" + rawFileDirRef.split(";#")[1]);
+ DocId rootFolderDocId = encodeDocId(l.getMetadata().getRootFolder());
+ DocId listDocId = encodeDocId(l.getMetadata().getDefaultViewUrl());
+ // If the parent is the List, we must use the list's docId instead of
+ // folderDocId, since the root folder is a List and not actually a
+ // Folder.
+ boolean parentIsList = folderDocId.equals(rootFolderDocId);
+ parentDocId = parentIsList ? listDocId : folderDocId;
+ String listScopeId = l.getMetadata().getScopeID()
+ .toLowerCase(Locale.ENGLISH);
+ // If a folder doesn't inherit its list's scope, then all of the
+ // folder's descendent list items are guaranteed to have a different
+ // scope than the list. We use this knowledge as a performance
+ // optimization to prevent issuing requests to discover the folder's
+ // scopeId when a child list item and list have the same scope.
+ if (parentIsList || scopeId.equals(listScopeId)) {
+ parentScopeId = listScopeId;
+ } else {
+ // Instead of using getURLSegments and getContent(ListItem), we could
+ // use just getContent(Folder). However, getContent(Folder) always
+ // returns children which could make the call very expensive. In
+ // addition, getContent(ListItem) returns all the metadata for the
+ // folder instead of just its scope so if in the future we need more
+ // metadata we will already have it. GetContentEx(Folder) may provide
+ // a way to get the folder's scope without its children, but it wasn't
+ // investigated.
+ Holder<String> folderListId = new Holder<String>();
+ Holder<String> folderItemId = new Holder<String>();
+ Holder<Boolean> result = new Holder<Boolean>();
+ siteData.getURLSegments(folderDocId.getUniqueId(), result, null,
+ null, folderListId, folderItemId);
+ if (!result.value) {
+ throw new IOException("Could not find parent folder's itemId");
+ }
+ if (!listId.equals(folderListId.value)) {
+ throw new AssertionError("Unexpected listId value");
+ }
+ ItemData folderItem = getContentItem(listId, folderItemId.value);
+ Element folderData = getFirstChildWithName(
+ folderItem.getXml(), DATA_ELEMENT);
+ Element folderRow
+ = getChildrenWithName(folderData, ROW_ELEMENT).get(0);
+ parentScopeId = folderRow.getAttribute(OWS_SCOPEID_ATTRIBUTE)
+ .split(";#", 2)[1].toLowerCase(Locale.ENGLISH);
+ }
}
- if (permissions == null) {
+ Acl.Builder acl = null;
+ if (scopeId.equals(parentScopeId)) {
+ acl = new Acl.Builder().setInheritFrom(parentDocId);
+ } else {
// We have to search for the correct scope within the scopes element.
// The scope provided in the metadata is for the parent list, not for
// the item
Scopes scopes = getFirstChildOfType(xml, Scopes.class);
for (Scopes.Scope scope : scopes.getScope()) {
if (scope.getId().toLowerCase(Locale.ENGLISH).equals(scopeId)) {
- permissions = scope.getPermission();
+ acl = generateAcl(scope.getPermission(), LIST_ITEM_MASK)
+ .setInheritFrom(virtualServerDocId);
break;
}
}
+
+ if (acl == null) {
+ throw new IOException("Unable to find permission scope for item: "
+ + request.getDocId());
+ }
}
- if (permissions == null) {
- throw new IOException("Unable to find permission scope for item: "
- + request.getDocId());
- }
-
- String rawFileDirRef = row.getAttribute(OWS_FILEDIRREF_ATTRIBUTE);
- // This should be in the form of "1234;#site/list/path". We want to
- // extract the site/list/path. Path relative to host, even though it
- // doesn't have a leading '/'.
- DocId folderDocId = encodeDocId("/" + rawFileDirRef.split(";#")[1]);
- DocId rootFolderDocId = encodeDocId(l.getMetadata().getRootFolder());
- DocId listDocId = encodeDocId(l.getMetadata().getDefaultViewUrl());
- // If the parent is the List, we must use the list's docId instead of
- // folderDocId, since the root folder is a List and not actually a Folder.
- DocId parentDocId = folderDocId.equals(rootFolderDocId)
- ? listDocId : folderDocId;
- response.setAcl(generateAcl(permissions, LIST_ITEM_MASK)
- .setInheritanceType(Acl.InheritanceType.AND_BOTH_PERMIT)
- .setInheritFrom(parentDocId)
+ response.setAcl(acl
+ .setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.build());
// This should be in the form of "1234;#0". We want to extract the 0.
@@ -997,8 +1073,6 @@
+ "Proceeding to provide content.");
response.setAcl(new Acl.Builder()
.setInheritFrom(encodeDocId(listItemUrl))
- // TODO(ejona): Add setPermitGroups for the special "everyone" group
- // once it is supported by GSA and Adaptor library.
.build());
getFileDocContent(request, response);
log.exiting("SiteDataClient", "getAttachmentDocContent", true);
@@ -1205,10 +1279,10 @@
return site;
}
- private Web getContentWeb(String id) throws IOException {
- log.entering("SiteDataClient", "getContentWeb", id);
+ private Web getContentWeb() throws IOException {
+ log.entering("SiteDataClient", "getContentWeb");
Holder<String> result = new Holder<String>();
- siteData.getContent(ObjectType.SITE, id, null, null, true, false, null,
+ siteData.getContent(ObjectType.SITE, null, null, null, true, false, null,
result);
String xml = result.value;
xml = xml.replace("<Web>", "<Web xmlns='" + XMLNS + "'>");
@@ -1246,12 +1320,12 @@
return data;
}
- private Paginator<ItemData> getContentFolder(final String guid,
+ private Paginator<ItemData> getContentFolderChildren(final String guid,
final String url) {
- log.entering("SiteDataClient", "getContentFolder",
+ log.entering("SiteDataClient", "getContentFolderChildren",
new Object[] {guid, url});
final Holder<String> lastItemIdOnPage = new Holder<String>("");
- log.exiting("SiteDataClient", "getContentFolder");
+ log.exiting("SiteDataClient", "getContentFolderChildren");
return new Paginator<ItemData>() {
@Override
public ItemData next() throws IOException {
@@ -1268,6 +1342,21 @@
};
}
+ private ItemData getContentFolder(final String guid,
+ final String url) throws IOException {
+ log.entering("SiteDataClient", "getContentFolder",
+ new Object[] {guid, url});
+ final Holder<String> lastItemIdOnPage = new Holder<String>("");
+ Holder<String> result = new Holder<String>();
+ siteData.getContent(ObjectType.FOLDER, guid, url, null, false, true,
+ lastItemIdOnPage, result);
+ String xml = result.value;
+ xml = xml.replace("<Folder>", "<Folder xmlns='" + XMLNS + "'>");
+ ItemData data = jaxbParse(xml, ItemData.class);
+ log.exiting("SiteDataClient", "getContentFolder", data);
+ return data;
+ }
+
private Item getContentListItemAttachments(String listId, String itemId)
throws IOException {
log.entering("SiteDataClient", "getContentListItemAttachments",
diff --git a/test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java b/test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java
index 07dc179..1bb7ac9 100644
--- a/test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java
+++ b/test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java
@@ -511,7 +511,7 @@
assertEquals(golden, responseString);
assertEquals(new Acl.Builder()
.setInheritFrom(new DocId(""))
- .setInheritanceType(Acl.InheritanceType.AND_BOTH_PERMIT)
+ .setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.setPermitGroups(groups("chinese1 Members", "chinese1 Owners",
"chinese1 Visitors"))
.setPermitUsers(users("GDC-PSL\\spuser1")).build(),
@@ -565,6 +565,55 @@
+ "<Field Name=\"LinkTitle\" Title=\"Title\" Type=\"Computed\" />"
+ "<Field Name=\"DocIcon\" Title=\"Type\" Type=\"Computed\" />"
+ "</Schema></List>";
+ final String getContentSite
+ = "<Web>"
+ + "<Metadata URL=\"http://localhost:1\""
+ + " LastModified=\"2012-05-15 19:07:39Z\""
+ + " Created=\"2011-10-14 18:59:25Z\""
+ + " ID=\"{b2ea1067-3a54-4ab7-a459-c8ec864b97eb}\""
+ + " Title=\"chinese1\" Description=\"\""
+ + " Author=\"GDC-PSL\\administrator\" Language=\"1033\""
+ + " CRC=\"558566148\" NoIndex=\"False\" DefaultHomePage=\"\""
+ + " ExternalSecurity=\"False\""
+ + " ScopeID=\"{01abac8c-66c8-4fed-829c-8dd02bbf40dd}\""
+ + " AllowAnonymousAccess=\"False\" AnonymousViewListItems=\"False\""
+ + " AnonymousPermMask=\"0\" />"
+ + "<Users>"
+ + "<User ID=\"1\" Sid=\"S-1-5-21-736914693-3137354690-2813686979-500\""
+ + " Name=\"GDC-PSL\\administrator\""
+ + " LoginName=\"GDC-PSL\\administrator\" Email=\"\" Notes=\"\""
+ + " IsSiteAdmin=\"True\" IsDomainGroup=\"False\" />"
+ + "<User ID=\"2\" Sid=\"S-1-5-21-736914693-3137354690-2813686979-1130\""
+ + " Name=\"spuser1\" LoginName=\"GDC-PSL\\spuser1\" Email=\"\""
+ + " Notes=\"\" IsSiteAdmin=\"True\" IsDomainGroup=\"False\" />"
+ + "</Users>"
+ + "<ACL><permissions>"
+ + "<permission memberid='2' mask='9223372036854775807' />"
+ + "<permission memberid='3' mask='9223372036854775807' />"
+ + "<permission memberid='4' mask='756052856929' />"
+ + "<permission memberid='5' mask='1856436900591' />"
+ + "</permissions>"
+ + "</ACL>"
+ + "<Webs>"
+ + "<Web URL=\"http://localhost:1/somesite\""
+ + " ID=\"{ee63e7d0-da23-4553-9f14-359f1cc1bf1c}\""
+ + " LastModified=\"2012-05-15 19:07:39Z\" />"
+ + "</Webs><Lists>"
+ + "<List ID=\"{133fcb96-7e9b-46c9-b5f3-09770a35ad8a}\""
+ + " LastModified=\"2012-05-15 18:21:38Z\""
+ + " DefaultViewUrl=\"/Lists/Announcements/AllItems.aspx\" />"
+ + "<List ID=\"{648f6636-3d90-4565-86b9-2dd7611fc855}\""
+ + " LastModified=\"2012-05-15 19:07:40Z\""
+ + " DefaultViewUrl=\"/Shared Documents/Forms/AllItems.aspx\" />"
+ + "</Lists>"
+ + "<FPFolder><Folders>"
+ + "<Folder URL=\"Lists\" ID=\"{c2c6cfcc-439e-4372-8a7a-87bec657eebf}\""
+ + " LastModified=\"2012-05-15 19:07:39Z\" />"
+ + "</Folders><Files>"
+ + "<File URL=\"default.aspx\""
+ + " ID=\"{1bdad8a3-376d-448c-b9c3-de91a6152687}\""
+ + " LastModified=\"2012-05-15 19:07:39Z\" />"
+ + "</Files></FPFolder></Web>";
final String getContentFolderResponse
= "<Folder><Metadata>"
+ "<scope id=\"{f9cb02b3-7f29-4cac-804f-ba6e14f1eb39}\">"
@@ -865,6 +914,12 @@
assertEquals(null, folderUrl);
assertEquals(null, itemId);
setValue(getContentResult, getContentListResponse);
+ } else if (ObjectType.SITE.equals(objectType)) {
+ assertEquals(false, securityOnly);
+ assertEquals(null, objectId);
+ assertEquals(null, folderUrl);
+ assertEquals(null, itemId);
+ setValue(getContentResult, getContentSite);
} else if (ObjectType.FOLDER.equals(objectType)) {
assertEquals(false, securityOnly);
assertEquals("{6F33949A-B3FF-4B0C-BA99-93CB518AC2C0}", objectId);
@@ -914,8 +969,8 @@
+ "</ul></body></html>";
assertEquals(golden, responseString);
assertEquals(new Acl.Builder()
- .setInheritFrom(new DocId("http://localhost:1/sites/SiteCollection"))
- .setInheritanceType(Acl.InheritanceType.AND_BOTH_PERMIT)
+ .setInheritFrom(new DocId(""))
+ .setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.setPermitGroups(groups("SiteCollection Members",
"SiteCollection Owners", "SiteCollection Visitors")).build(),
response.getAcl());
@@ -1558,6 +1613,252 @@
+ " ows__IsCurrentVersion='1' ows_ServerRedirected='0'/>"
+ "</rs:data>"
+ "</xml></Item>";
+ final String getContentFolderResponse
+ = "<Item><Metadata>"
+ + "<scope id=\"{f9cb02b3-7f29-4cac-804f-ba6e14f1eb39}\">"
+ + "<permissions><permission memberid='1' mask='206292717568' />"
+ + "<permission memberid='3' mask='9223372036854775807' />"
+ + "<permission memberid='4' mask='756052856929' />"
+ + "<permission memberid='5' mask='1856436900591' />"
+ + "</permissions></scope>"
+ + "</Metadata>"
+ + "<xml xmlns:s='uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882'"
+ + " xmlns:dt='uuid:C2F41010-65B3-11d1-A29F-00AA00C14882'"
+ + " xmlns:rs='urn:schemas-microsoft-com:rowset'"
+ + " xmlns:z='#RowsetSchema'>"
+ + "<s:Schema id='RowsetSchema'>"
+ + "<s:ElementType name='row' content='eltOnly' rs:CommandTimeout='30'>"
+ + "<s:AttributeType name='ows_ContentTypeId' rs:name='Content Type ID'"
+ + " rs:number='1'>"
+ + "<s:datatype dt:type='int' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Title' rs:name='Title' rs:number='2'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__ModerationComments'"
+ + " rs:name='Approver Comments' rs:number='3'>"
+ + "<s:datatype dt:type='string' dt:maxLength='1073741823' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_File_x0020_Type' rs:name='File Type'"
+ + " rs:number='4'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Additional_x0020_Info'"
+ + " rs:name='Additional Info' rs:number='5'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_ContentType' rs:name='Content Type'"
+ + " rs:number='6'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_ID' rs:name='ID' rs:number='7'>"
+ + "<s:datatype dt:type='i4' dt:maxLength='4' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Modified' rs:name='Modified'"
+ + " rs:number='8'>"
+ + "<s:datatype dt:type='datetime' dt:maxLength='8' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Created' rs:name='Created' rs:number='9'>"
+ + "<s:datatype dt:type='datetime' dt:maxLength='8' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Author' rs:name='Created By'"
+ + " rs:number='10'>"
+ + "<s:datatype dt:type='string' dt:lookup='true' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Editor' rs:name='Modified By'"
+ + " rs:number='11'>"
+ + "<s:datatype dt:type='string' dt:lookup='true' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__HasCopyDestinations'"
+ + " rs:name='Has Copy Destinations' rs:number='12'>"
+ + "<s:datatype dt:type='boolean' dt:maxLength='1' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__CopySource' rs:name='Copy Source'"
+ + " rs:number='13'>"
+ + "<s:datatype dt:type='string' dt:maxLength='1073741823' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_owshiddenversion'"
+ + " rs:name='owshiddenversion' rs:number='14'>"
+ + "<s:datatype dt:type='i4' dt:maxLength='4' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_WorkflowVersion'"
+ + " rs:name='Workflow Version' rs:number='15'>"
+ + "<s:datatype dt:type='i4' dt:maxLength='4' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__UIVersion' rs:name='UI Version'"
+ + " rs:number='16'>"
+ + "<s:datatype dt:type='i4' dt:maxLength='4' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__UIVersionString' rs:name='Version'"
+ + " rs:number='17'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Attachments' rs:name='Attachments'"
+ + " rs:number='18'>"
+ + "<s:datatype dt:type='boolean' dt:maxLength='1' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__ModerationStatus'"
+ + " rs:name='Approval Status' rs:number='19'>"
+ + "<s:datatype dt:type='i4' dt:maxLength='4' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_LinkTitleNoMenu' rs:name='Title'"
+ + " rs:number='20'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_LinkTitle' rs:name='Title'"
+ + " rs:number='21'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_SelectTitle' rs:name='Select'"
+ + " rs:number='22'>"
+ + "<s:datatype dt:type='i4' dt:maxLength='4' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_InstanceID' rs:name='Instance ID'"
+ + " rs:number='23'>"
+ + "<s:datatype dt:type='i4' dt:maxLength='4' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Order' rs:name='Order' rs:number='24'>"
+ + "<s:datatype dt:type='float' dt:maxLength='8' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_GUID' rs:name='GUID' rs:number='25'>"
+ + "<s:datatype dt:type='string' dt:maxLength='38' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_WorkflowInstanceID'"
+ + " rs:name='Workflow Instance ID' rs:number='26'>"
+ + "<s:datatype dt:type='string' dt:maxLength='38' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_FileRef' rs:name='URL Path'"
+ + " rs:number='27'>"
+ + "<s:datatype dt:type='string' dt:lookup='true' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_FileDirRef' rs:name='Path'"
+ + " rs:number='28'>"
+ + "<s:datatype dt:type='string' dt:lookup='true' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Last_x0020_Modified' rs:name='Modified'"
+ + " rs:number='29'>"
+ + "<s:datatype dt:type='datetime' dt:lookup='true' dt:maxLength='8' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_Created_x0020_Date' rs:name='Created'"
+ + " rs:number='30'>"
+ + "<s:datatype dt:type='datetime' dt:lookup='true' dt:maxLength='8' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_FSObjType' rs:name='Item Type'"
+ + " rs:number='31'>"
+ + "<s:datatype dt:type='ui1' dt:lookup='true' dt:maxLength='4' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_PermMask'"
+ + " rs:name='Effective Permissions Mask' rs:number='32'>"
+ + "<s:datatype dt:type='string' dt:maxLength='1073741823' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_FileLeafRef' rs:name='Name'"
+ + " rs:number='33'>"
+ + "<s:datatype dt:type='string' dt:lookup='true' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_UniqueId' rs:name='Unique Id'"
+ + " rs:number='34'>"
+ + "<s:datatype dt:type='string' dt:lookup='true' dt:maxLength='38' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_ProgId' rs:name='ProgId' rs:number='35'>"
+ + "<s:datatype dt:type='string' dt:lookup='true' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_ScopeId' rs:name='ScopeId'"
+ + " rs:number='36'>"
+ + "<s:datatype dt:type='string' dt:lookup='true' dt:maxLength='38' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_HTML_x0020_File_x0020_Type'"
+ + " rs:name='HTML File Type' rs:number='37'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__EditMenuTableStart'"
+ + " rs:name='Edit Menu Table Start' rs:number='38'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__EditMenuTableEnd'"
+ + " rs:name='Edit Menu Table End' rs:number='39'>"
+ + "<s:datatype dt:type='i4' dt:maxLength='4' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_LinkFilenameNoMenu' rs:name='Name'"
+ + " rs:number='40'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_LinkFilename' rs:name='Name'"
+ + " rs:number='41'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_DocIcon' rs:name='Type' rs:number='42'>"
+ + "<s:datatype dt:type='string' dt:maxLength='512' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_ServerUrl' rs:name='Server Relative URL'"
+ + " rs:number='43'>"
+ + "<s:datatype dt:type='string' dt:maxLength='1073741823' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_EncodedAbsUrl'"
+ + " rs:name='Encoded Absolute URL' rs:number='44'>"
+ + "<s:datatype dt:type='string' dt:maxLength='1073741823' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_BaseName' rs:name='File Name'"
+ + " rs:number='45'>"
+ + "<s:datatype dt:type='string' dt:maxLength='1073741823' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows_MetaInfo' rs:name='Property Bag'"
+ + " rs:number='46'>"
+ + "<s:datatype dt:type='int' dt:lookup='true' dt:maxLength='2147483646'"
+ + " />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__Level' rs:name='Level' rs:number='47'>"
+ + "<s:datatype dt:type='ui1' dt:maxLength='1' />"
+ + "</s:AttributeType>"
+ + "<s:AttributeType name='ows__IsCurrentVersion'"
+ + " rs:name='Is Current Version' rs:number='48'>"
+ + "<s:datatype dt:type='boolean' dt:maxLength='1' />"
+ + "</s:AttributeType>"
+ + "</s:ElementType></s:Schema><scopes>"
+ + "<scope id='{f9cb02b3-7f29-4cac-804f-ba6e14f1eb39}' >"
+ + "<permission memberid='1' mask='206292717568' />"
+ + "<permission memberid='3' mask='9223372036854775807' />"
+ + "<permission memberid='4' mask='756052856929' />"
+ + "<permission memberid='5' mask='1856436900591' />"
+ + "</scope>"
+ + "<scope id='{2e29615c-59e7-493b-b08a-3642949cc069}' >"
+ + "<permission memberid='1' mask='9223372036854775807' />"
+ + "<permission memberid='3' mask='9223372036854775807' />"
+ + "<permission memberid='4' mask='756052856929' />"
+ + "<permission memberid='5' mask='1856436900591' />"
+ + "</scope>"
+ + "</scopes>"
+ + "<rs:data ItemCount=\"1\">"
+ + "<z:row"
+ + " ows_ContentTypeId='0x01200077DD29735CE61148A73F540231F24430'"
+ + " ows_Title='Test Folder' ows_ContentType='Folder' ows_ID='1'"
+ + " ows_Modified='2012-05-01T22:13:47Z'"
+ + " ows_Created='2012-05-01T22:13:47Z'"
+ + " ows_Author='1073741823;#System Account'"
+ + " ows_Editor='1073741823;#System Account' ows_owshiddenversion='1'"
+ + " ows_WorkflowVersion='1' ows__UIVersion='512'"
+ + " ows__UIVersionString='1.0' ows_Attachments='0'"
+ + " ows__ModerationStatus='0' ows_LinkTitleNoMenu='Test Folder'"
+ + " ows_LinkTitle='Test Folder' ows_SelectTitle='1'"
+ + " ows_Order='100.000000000000'"
+ + " ows_GUID='{C099F4ED-6E96-4A00-B94A-EE443061EE49}'"
+ + " ows_FileRef='1;#sites/SiteCollection/Lists/Custom List/Test Folder'"
+ + " ows_FileDirRef='1;#sites/SiteCollection/Lists/Custom List'"
+ + " ows_Last_x0020_Modified='1;#2012-05-02T21:13:17Z'"
+ + " ows_Created_x0020_Date='1;#2012-05-01T22:13:47Z'"
+ + " ows_FSObjType='1;#1' ows_PermMask='0x7fffffffffffffff'"
+ + " ows_FileLeafRef='1;#Test Folder'"
+ + " ows_UniqueId='1;#{CE33B6B7-9F5E-4224-8D77-9C42E6290FE6}'"
+ + " ows_ProgId='1;#'"
+ + " ows_ScopeId='1;#{2E29615C-59E7-493B-B08A-3642949CC069}'"
+ + " ows__EditMenuTableStart='Test Folder' ows__EditMenuTableEnd='1'"
+ + " ows_LinkFilenameNoMenu='Test Folder' ows_LinkFilename='Test Folder'"
+ + " ows_ServerUrl='/sites/SiteCollection/Lists/Custom List/Test Folder'"
+ + " ows_EncodedAbsUrl='http://localhost:1/sites/SiteCollection/Lists/Cu"
+ + "stom%20List/Test%20Folder'"
+ + " ows_BaseName='Test Folder' ows_MetaInfo='1;#' ows__Level='1'"
+ + " ows__IsCurrentVersion='1' ows_ServerRedirected='0'/>"
+ + "</rs:data>"
+ + "</xml></Item>";
final String getContentListItemAttachmentsResponse
= "<Item Count=\"1\">"
+ "<Attachment URL=\"http://localhost:1/sites/SiteCollection/Lists/Cust"
@@ -1569,13 +1870,23 @@
Holder<Boolean> getURLSegmentsResult, Holder<String> strWebID,
Holder<String> strBucketID, Holder<String> strListID,
Holder<String> strItemID) {
- assertEquals("http://localhost:1/sites/SiteCollection/Lists/Custom List"
- + "/Test Folder/2_.000", strURL);
- setValue(getURLSegmentsResult, true);
- setValue(strWebID, null);
- setValue(strBucketID, null);
- setValue(strListID, "{6F33949A-B3FF-4B0C-BA99-93CB518AC2C0}");
- setValue(strItemID, "2");
+ if (("http://localhost:1/sites/SiteCollection/Lists/Custom List"
+ + "/Test Folder/2_.000").equals(strURL)) {
+ setValue(getURLSegmentsResult, true);
+ setValue(strWebID, null);
+ setValue(strBucketID, null);
+ setValue(strListID, "{6F33949A-B3FF-4B0C-BA99-93CB518AC2C0}");
+ setValue(strItemID, "2");
+ } else if (("http://localhost:1/sites/SiteCollection/Lists/Custom List"
+ + "/Test Folder").equals(strURL)) {
+ setValue(getURLSegmentsResult, true);
+ setValue(strWebID, null);
+ setValue(strBucketID, null);
+ setValue(strListID, "{6F33949A-B3FF-4B0C-BA99-93CB518AC2C0}");
+ setValue(strItemID, "1");
+ } else {
+ fail("Unexpected strUrl: " + strURL);
+ }
}
@Override
@@ -1585,10 +1896,15 @@
Holder<String> getContentResult) {
setValue(lastItemIdOnPage, null);
if (ObjectType.LIST_ITEM.equals(objectType)) {
- assertEquals(false, securityOnly);
- assertEquals("{6F33949A-B3FF-4B0C-BA99-93CB518AC2C0}", objectId);
- assertEquals("2", itemId);
- setValue(getContentResult, getContentListItemResponse);
+ if ("1".equals(itemId)) {
+ assertEquals(false, securityOnly);
+ assertEquals("{6F33949A-B3FF-4B0C-BA99-93CB518AC2C0}", objectId);
+ setValue(getContentResult, getContentFolderResponse);
+ } else if ("2".equals(itemId)) {
+ assertEquals(false, securityOnly);
+ assertEquals("{6F33949A-B3FF-4B0C-BA99-93CB518AC2C0}", objectId);
+ setValue(getContentResult, getContentListItemResponse);
+ }
} else if (ObjectType.LIST_ITEM_ATTACHMENTS.equals(objectType)) {
assertEquals(false, securityOnly);
assertEquals("{6F33949A-B3FF-4B0C-BA99-93CB518AC2C0}", objectId);
@@ -1688,10 +2004,7 @@
assertEquals(new Acl.Builder()
.setInheritFrom(new DocId("http://localhost:1/sites/SiteCollection/"
+ "Lists/Custom List/Test Folder"))
- .setInheritanceType(Acl.InheritanceType.AND_BOTH_PERMIT)
- .setPermitGroups(groups("SiteCollection Members",
- "SiteCollection Owners", "SiteCollection Visitors"))
- .setPermitUsers(users("GDC-PSL\\administrator")).build(),
+ .setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES).build(),
response.getAcl());
}
@@ -2165,7 +2478,7 @@
assertEquals(new Acl.Builder()
.setInheritFrom(new DocId(
"http://localhost:1/tapasnay/Lists/Announcements"))
- .setInheritanceType(Acl.InheritanceType.AND_BOTH_PERMIT).build(),
+ .setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES).build(),
response.getAcl());
}
@@ -2868,9 +3181,8 @@
assertEquals(golden, responseString);
assertEquals(goldenMetadata, response.getMetadata());
assertEquals(new Acl.Builder()
- .setInheritFrom(new DocId("http://localhost:1/sites/SiteCollection/"
- + "Lists/Custom List/AllItems.aspx"))
- .setInheritanceType(Acl.InheritanceType.AND_BOTH_PERMIT)
+ .setInheritFrom(new DocId(""))
+ .setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.setPermitGroups(groups("SiteCollection Members",
"SiteCollection Owners", "SiteCollection Visitors"))
.setPermitUsers(users("GDC-PSL\\administrator")).build(),
