diff options
author | Simon Rettberg | 2018-12-01 16:35:28 +0100 |
---|---|---|
committer | Simon Rettberg | 2018-12-01 16:35:28 +0100 |
commit | d5f8fb9c2f8c60fd144403cf9583592b8bdd79e2 (patch) | |
tree | bac70ffac093ad6382d6fd24a410e6de88ec9de6 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | |
parent | [server] Updater: Create preset filters/netshares tables, constraints (diff) | |
download | tutor-module-d5f8fb9c2f8c60fd144403cf9583592b8bdd79e2.tar.gz tutor-module-d5f8fb9c2f8c60fd144403cf9583592b8bdd79e2.tar.xz tutor-module-d5f8fb9c2f8c60fd144403cf9583592b8bdd79e2.zip |
[server] Support loading/saving custom lecture/LDAP filters
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java')
-rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java index 30c38288..52ec6b21 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java @@ -3,6 +3,7 @@ package org.openslx.bwlp.sat.thrift; import java.io.File; import java.nio.ByteBuffer; import java.sql.SQLException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -14,6 +15,7 @@ import org.openslx.bwlp.sat.database.mappers.DbImage; import org.openslx.bwlp.sat.database.mappers.DbImage.DeleteState; import org.openslx.bwlp.sat.database.mappers.DbImagePermissions; import org.openslx.bwlp.sat.database.mappers.DbLecture; +import org.openslx.bwlp.sat.database.mappers.DbLectureFilter; import org.openslx.bwlp.sat.database.mappers.DbLecturePermissions; import org.openslx.bwlp.sat.database.mappers.DbLocation; import org.openslx.bwlp.sat.database.mappers.DbLog; @@ -43,13 +45,17 @@ import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.bwlp.thrift.iface.ImageVersionDetails; import org.openslx.bwlp.thrift.iface.ImageVersionWrite; import org.openslx.bwlp.thrift.iface.InvocationError; +import org.openslx.bwlp.thrift.iface.LdapFilter; import org.openslx.bwlp.thrift.iface.LecturePermissions; import org.openslx.bwlp.thrift.iface.LectureRead; import org.openslx.bwlp.thrift.iface.LectureSummary; import org.openslx.bwlp.thrift.iface.LectureWrite; import org.openslx.bwlp.thrift.iface.Location; +import org.openslx.bwlp.thrift.iface.NetShare; +import org.openslx.bwlp.thrift.iface.NetShareAuth; import org.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.bwlp.thrift.iface.Organization; +import org.openslx.bwlp.thrift.iface.PredefinedData; import org.openslx.bwlp.thrift.iface.SatelliteConfig; import org.openslx.bwlp.thrift.iface.SatelliteServer; import org.openslx.bwlp.thrift.iface.SatelliteStatus; @@ -780,4 +786,21 @@ public class ServerHandler implements SatelliteServer.Iface { } } + @Override + public PredefinedData getPredefinedData(String userToken) throws TAuthorizationException, + TInvocationException, TException { + PredefinedData data = new PredefinedData(new ArrayList<NetShare>(), new ArrayList<LdapFilter>()); + try { + data.ldapFilter = DbLectureFilter.getPredefinedLdapFilters(); + } catch (SQLException e) { + throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, + "Database failure when querying predefined LDAP filters."); + } + // Dummy 2 + NetShare ns = new NetShare(NetShareAuth.OTHER_USER, "\\\\server.example.org\\data"); + ns.setShareId(1); + data.netShares.add(ns); + return data; + } + } |