Revision 6532
Added by ben leinfelder over 12 years ago
D1NodeService.java | ||
---|---|---|
66 | 66 |
import org.dataone.service.types.v1.Person; |
67 | 67 |
import org.dataone.service.types.v1.Session; |
68 | 68 |
import org.dataone.service.types.v1.Subject; |
69 |
import org.dataone.service.types.v1.SubjectInfo; |
|
69 | 70 |
import org.dataone.service.types.v1.SubjectList; |
70 | 71 |
import org.dataone.service.types.v1.SystemMetadata; |
71 | 72 |
import org.dataone.service.types.v1.util.ChecksumUtil; |
... | ... | |
155 | 156 |
|
156 | 157 |
// be sure the user is authenticated for create() |
157 | 158 |
if (subject == null || subject.getValue() == null || |
158 |
subject.getValue().toLowerCase().equals(Constants.PUBLIC_SUBJECT) ) {
|
|
159 |
subject.getValue().toLowerCase().equals(Constants.SUBJECT_PUBLIC) ) {
|
|
159 | 160 |
throw new NotAuthorized("1100", "The provided identity does not have " + |
160 | 161 |
"permission to WRITE to the Node."); |
161 | 162 |
|
... | ... | |
487 | 488 |
} |
488 | 489 |
|
489 | 490 |
// log the read event |
490 |
String principal = Constants.PUBLIC_SUBJECT;
|
|
491 |
String principal = Constants.SUBJECT_PUBLIC;
|
|
491 | 492 |
if (session != null && session.getSubject() != null) { |
492 | 493 |
principal = session.getSubject().getValue(); |
493 | 494 |
} |
... | ... | |
618 | 619 |
if (subject != null) { |
619 | 620 |
subjects.add(subject); |
620 | 621 |
} |
621 |
SubjectList subjectList = session.getSubjectList();
|
|
622 |
if (subjectList != null) {
|
|
623 |
List<Person> personList = subjectList.getPersonList();
|
|
622 |
SubjectInfo subjecInfo = session.getSubjectInfo();
|
|
623 |
if (subjecInfo != null) {
|
|
624 |
List<Person> personList = subjecInfo.getPersonList();
|
|
624 | 625 |
if (personList != null) { |
625 | 626 |
for (Person p: personList) { |
626 | 627 |
subjects.add(p.getSubject()); |
627 | 628 |
} |
628 | 629 |
} |
629 |
List<Group> groupList = subjectList.getGroupList();
|
|
630 |
List<Group> groupList = subjecInfo.getGroupList();
|
|
630 | 631 |
if (groupList != null) { |
631 | 632 |
for (Group g: groupList) { |
632 | 633 |
subjects.add(g.getSubject()); |
... | ... | |
637 | 638 |
|
638 | 639 |
// add public subject |
639 | 640 |
Subject publicSubject = new Subject(); |
640 |
publicSubject.setValue(Constants.PUBLIC_SUBJECT);
|
|
641 |
publicSubject.setValue(Constants.SUBJECT_PUBLIC);
|
|
641 | 642 |
subjects.add(publicSubject); |
642 | 643 |
|
643 | 644 |
// get the system metadata |
... | ... | |
818 | 819 |
doctext[0] = xml; |
819 | 820 |
params.put("doctext", doctext); |
820 | 821 |
|
821 |
String username = Constants.PUBLIC_SUBJECT;
|
|
822 |
String username = Constants.SUBJECT_PUBLIC;
|
|
822 | 823 |
String[] groupnames = null; |
823 | 824 |
if (session != null ) { |
824 | 825 |
username = session.getSubject().getValue(); |
825 |
if (session.getSubjectList() != null) {
|
|
826 |
List<Group> groupList = session.getSubjectList().getGroupList();
|
|
826 |
if (session.getSubjectInfo() != null) {
|
|
827 |
List<Group> groupList = session.getSubjectInfo().getGroupList();
|
|
827 | 828 |
if (groupList != null) { |
828 | 829 |
groupnames = new String[groupList.size()]; |
829 | 830 |
for (int i = 0; i > groupList.size(); i++ ) { |
... | ... | |
867 | 868 |
protected String insertDataObject(InputStream object, Identifier pid, Session session) throws ServiceFailure { - String username = Constants.PUBLIC_SUBJECT; |
869 |
String username = Constants.SUBJECT_PUBLIC; |
|
868 | 870 |
String[] groupnames = null; |
869 | 871 |
if (session != null ) { |
870 | 872 |
username = session.getSubject().getValue(); |
871 |
if (session.getSubjectList() != null) {
|
|
872 |
List<Group> groupList = session.getSubjectList().getGroupList();
|
|
873 |
if (session.getSubjectInfo() != null) {
|
|
874 |
List<Group> groupList = session.getSubjectInfo().getGroupList();
|
|
873 | 875 |
if (groupList != null) { |
874 | 876 |
groupnames = new String[groupList.size()]; |
875 | 877 |
for (int i = 0; i > groupList.size(); i++ ) { |
Also available in: Unified diff
update D1 jars to include recent SubjectList -> SubjectInfo refactoring and the SUBJECT_PUBLIC constant