Enable case insensitivity for ACLs
diff --git a/lib/plexi b/lib/plexi
index 018e8e7..b4a81e0 160000
--- a/lib/plexi
+++ b/lib/plexi
@@ -1 +1 @@
-Subproject commit 018e8e7e65689863317ed3313975be56a366d07e
+Subproject commit b4a81e0f8b4e5437bb222b84ef8b06b1be4a2c35
diff --git a/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java b/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
index 2a2416b..7020ab9 100644
--- a/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
+++ b/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
@@ -603,6 +603,7 @@
}
}
response.setAcl(new Acl.Builder()
+ .setEverythingCaseInsensitive()
.setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.setPermitUsers(permitUsers).setPermitGroups(permitGroups)
.setDenyUsers(denyUsers).setDenyGroups(denyGroups).build());
@@ -878,8 +879,8 @@
log.log(Level.WARNING, "Could not resolve member id {0}", id);
}
}
- return new Acl.Builder().setPermitUsers(permitUsers)
- .setPermitGroups(permitGroups);
+ return new Acl.Builder().setEverythingCaseInsensitive()
+ .setPermitUsers(permitUsers).setPermitGroups(permitGroups);
}
private void getAspxDocContent(Request request, Response response)
diff --git a/test/com/google/enterprise/adaptor/sharepoint/GetContentsResponse.java b/test/com/google/enterprise/adaptor/sharepoint/GetContentsResponse.java
index d43c183..cf4aaf8 100644
--- a/test/com/google/enterprise/adaptor/sharepoint/GetContentsResponse.java
+++ b/test/com/google/enterprise/adaptor/sharepoint/GetContentsResponse.java
@@ -35,6 +35,9 @@
private boolean noIndex;
private boolean noFollow;
private boolean noArchive;
+ private boolean lock;
+ private boolean crawlOnce;
+ private URI displayUrl;
public GetContentsResponse(OutputStream os) {
this.os = os;
@@ -101,6 +104,21 @@
this.noArchive = noArchive;
}
+ @Override
+ public void setLock(boolean lock) {
+ this.lock = lock;
+ }
+
+ @Override
+ public void setCrawlOnce(boolean crawlOnce) {
+ this.crawlOnce = crawlOnce;
+ }
+
+ @Override
+ public void setDisplayUrl(URI displayUrl) {
+ this.displayUrl = displayUrl;
+ }
+
public String getContentType() {
return contentType;
}
@@ -137,4 +155,16 @@
public boolean isNoArchive() {
return noArchive;
}
+
+ public boolean isLock() {
+ return lock;
+ }
+
+ public boolean isCrawlOnce() {
+ return crawlOnce;
+ }
+
+ public URI getDisplayUrl() {
+ return displayUrl;
+ }
}
diff --git a/test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java b/test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java
index 83af49f..70112c4 100644
--- a/test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java
+++ b/test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java
@@ -277,6 +277,7 @@
String[] permit = new String[] {"GDC-PSL\\Administrator",
"GDC-PSL\\spuser1", "NT AUTHORITY\\LOCAL SERVICE"};
assertEquals(new Acl.Builder()
+ .setEverythingCaseInsensitive()
.setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.setPermitUsers(users(permit)).setPermitGroups(groups(permit)).build(),
response.getAcl());
@@ -510,6 +511,7 @@
+ "</body></html>";
assertEquals(golden, responseString);
assertEquals(new Acl.Builder()
+ .setEverythingCaseInsensitive()
.setInheritFrom(new DocId(""))
.setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.setPermitGroups(groups("chinese1 Members", "chinese1 Owners",
@@ -969,6 +971,7 @@
+ "</ul></body></html>";
assertEquals(golden, responseString);
assertEquals(new Acl.Builder()
+ .setEverythingCaseInsensitive()
.setInheritFrom(new DocId(""))
.setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.setPermitGroups(groups("SiteCollection Members",
@@ -3181,6 +3184,7 @@
assertEquals(golden, responseString);
assertEquals(goldenMetadata, response.getMetadata());
assertEquals(new Acl.Builder()
+ .setEverythingCaseInsensitive()
.setInheritFrom(new DocId(""))
.setInheritanceType(Acl.InheritanceType.PARENT_OVERRIDES)
.setPermitGroups(groups("SiteCollection Members",
