Revision 6664
Added by ben leinfelder about 13 years ago
| src/edu/ucsb/nceas/metacat/dataone/D1NodeService.java | ||
|---|---|---|
| 558 | 558 |
if (subject != null) {
|
| 559 | 559 |
subjects.add(subject); |
| 560 | 560 |
} |
| 561 |
SubjectInfo subjecInfo = session.getSubjectInfo(); |
|
| 562 |
if (subjecInfo != null) {
|
|
| 563 |
List<Person> personList = subjecInfo.getPersonList(); |
|
| 561 |
SubjectInfo subjectInfo = session.getSubjectInfo();
|
|
| 562 |
if (subjectInfo != null) {
|
|
| 563 |
List<Person> personList = subjectInfo.getPersonList();
|
|
| 564 | 564 |
if (personList != null) {
|
| 565 | 565 |
for (Person p: personList) {
|
| 566 | 566 |
subjects.add(p.getSubject()); |
| 567 |
if (p.getVerified()) {
|
|
| 568 |
// add the verified symbolic user |
|
| 569 |
Subject verifiedSubject = new Subject(); |
|
| 570 |
verifiedSubject.setValue(Constants.SUBJECT_VERIFIED_USER); |
|
| 571 |
if (!subjects.contains(verifiedSubject)) {
|
|
| 572 |
subjects.add(verifiedSubject); |
|
| 573 |
} |
|
| 574 |
} |
|
| 567 | 575 |
} |
| 568 | 576 |
} |
| 569 |
List<Group> groupList = subjecInfo.getGroupList(); |
|
| 577 |
List<Group> groupList = subjectInfo.getGroupList();
|
|
| 570 | 578 |
if (groupList != null) {
|
| 571 | 579 |
for (Group g: groupList) {
|
| 572 | 580 |
subjects.add(g.getSubject()); |
| 573 | 581 |
} |
| 574 | 582 |
} |
| 575 | 583 |
} |
| 584 |
// add the authenticated symbolic as a check |
|
| 585 |
Subject authenticatedSubject = new Subject(); |
|
| 586 |
authenticatedSubject.setValue(Constants.SUBJECT_AUTHENTICATED_USER); |
|
| 587 |
subjects.add(authenticatedSubject); |
|
| 588 |
|
|
| 576 | 589 |
} |
| 577 | 590 |
|
| 578 | 591 |
// add public subject |
Also available in: Unified diff
check for authenticated and verified user permissions