diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-06-07 09:52:52 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-06-10 17:05:40 +0200 |
| commit | c78ed33f527479c60437839861ad9f5b7551b16b (patch) | |
| tree | 3bb5ed74ec1d2f95ba6d4f89297abbaf6ddfdc9d /base/tps/src/org | |
| parent | 20067ede195f039fd0864eb0aa8f69801bc03504 (diff) | |
| download | pki-c78ed33f527479c60437839861ad9f5b7551b16b.tar.gz pki-c78ed33f527479c60437839861ad9f5b7551b16b.tar.xz pki-c78ed33f527479c60437839861ad9f5b7551b16b.zip | |
Fixed TPS VLV filters.
Previously TPS VLVs for tokens and activities were defined using
presence filters of some optional attributes. If the optional
attribute is missing the entry will not be included in the search
result.
The VLVs have now been modified to use object class matching
filters to ensure they match all tokens and activities.
https://fedorahosted.org/pki/ticket/2354
Diffstat (limited to 'base/tps/src/org')
| -rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java | 2 | ||||
| -rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java b/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java index 46ab2128d..0a4dcf3d8 100644 --- a/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java +++ b/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java @@ -107,7 +107,7 @@ public class ActivityDatabase extends LDAPDatabase<ActivityRecord> { createFilter(sb, attributes); if (sb.length() == 0) { - sb.append("(&(tokenID=*)(userID=*))"); // listActivities VLV + sb.append("(objectClass=" + ActivityRecord.class.getName() + ")"); // listActivities VLV } return sb.toString(); diff --git a/base/tps/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java b/base/tps/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java index f751c66c9..9235e7871 100644 --- a/base/tps/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java +++ b/base/tps/src/org/dogtagpki/server/tps/dbs/TokenDatabase.java @@ -67,7 +67,7 @@ public class TokenDatabase extends LDAPDatabase<TokenRecord> { createFilter(sb, attributes); if (sb.length() == 0) { - sb.append("(&(id=*)(userID=*))"); // listTokens VLV + sb.append("(objectClass=" + TokenRecord.class.getName() + ")"); // listTokens VLV } return sb.toString(); |