@@ -68,11 +68,11 @@ func (h *sharesHandler) CreateShare(w http.ResponseWriter, r *http.Request) {
6868 ctx := r .Context ()
6969 log := appctx .GetLogger (ctx )
7070 req , err := getCreateShareRequest (r )
71+ log .Info ().Any ("req" , req ).Msg ("OCM /shares request received" )
7172 if err != nil {
7273 reqres .WriteError (w , r , reqres .APIErrorInvalidParameter , err .Error (), nil )
7374 return
7475 }
75- log .Info ().Any ("req" , req ).Msg ("OCM /shares request received" )
7676
7777 _ , meshProvider , err := getIDAndMeshProvider (req .Sender )
7878 log .Debug ().Msgf ("Determined Mesh Provider '%s' from req.Sender '%s'" , meshProvider , req .Sender )
@@ -99,7 +99,7 @@ func (h *sharesHandler) CreateShare(w http.ResponseWriter, r *http.Request) {
9999 Provider : & providerInfo ,
100100 })
101101 if err != nil {
102- reqres .WriteError (w , r , reqres .APIErrorServerError , "error sending a grpc is provider allowed request" , err )
102+ reqres .WriteError (w , r , reqres .APIErrorServerError , "error sending a grpc isProviderAllowed request" , err )
103103 return
104104 }
105105 if providerAllowedResp .Status .Code != rpc .Code_CODE_OK {
@@ -109,7 +109,7 @@ func (h *sharesHandler) CreateShare(w http.ResponseWriter, r *http.Request) {
109109
110110 shareWith , _ , err := getIDAndMeshProvider (req .ShareWith )
111111 if err != nil {
112- reqres .WriteError (w , r , reqres .APIErrorInvalidParameter , err . Error (), nil )
112+ reqres .WriteError (w , r , reqres .APIErrorInvalidParameter , "error with mesh provider" , err )
113113 return
114114 }
115115
@@ -127,19 +127,19 @@ func (h *sharesHandler) CreateShare(w http.ResponseWriter, r *http.Request) {
127127
128128 owner , err := getUserIDFromOCMUser (req .Owner )
129129 if err != nil {
130- reqres .WriteError (w , r , reqres .APIErrorInvalidParameter , err . Error (), nil )
130+ reqres .WriteError (w , r , reqres .APIErrorInvalidParameter , "error with remote owner" , err )
131131 return
132132 }
133133
134134 sender , err := getUserIDFromOCMUser (req .Sender )
135135 if err != nil {
136- reqres .WriteError (w , r , reqres .APIErrorInvalidParameter , err . Error (), nil )
136+ reqres .WriteError (w , r , reqres .APIErrorInvalidParameter , "error with remote sender" , err )
137137 return
138138 }
139139
140140 protocols , err := getAndResolveProtocols (req .Protocols , r )
141141 if err != nil {
142- reqres .WriteError (w , r , reqres .APIErrorInvalidParameter , err . Error (), nil )
142+ reqres .WriteError (w , r , reqres .APIErrorInvalidParameter , "error with protocols payload" , err )
143143 return
144144 }
145145
@@ -249,45 +249,46 @@ func getOCMShareType(t string) ocm.ShareType {
249249func getAndResolveProtocols (p Protocols , r * http.Request ) ([]* ocm.Protocol , error ) {
250250 protos := make ([]* ocm.Protocol , 0 , len (p ))
251251 for _ , data := range p {
252+ var uri string
252253 ocmProto := data .ToOCMProtocol ()
253254 protocolName := GetProtocolName (data )
254- var uri string
255- var isLocalhost bool
256-
257255 switch protocolName {
258256 case "webdav" :
259257 uri = ocmProto .GetWebdavOptions ().Uri
260- isLocalhost = strings .Contains (uri , "localhost" )
258+ reqs := ocmProto .GetWebdavOptions ().Requirements
259+ if len (reqs ) > 0 {
260+ // we currently do not support any kind of requirement
261+ return nil , errtypes .BadRequest (fmt .Sprintf ("incoming OCM share with requirements %+v not supported at this endpoint" , reqs ))
262+ }
261263 case "webapp" :
262- uri = ocmProto .GetWebappOptions ().UriTemplate
263- isLocalhost = strings .Contains (uri , "localhost" )
264+ uri = ocmProto .GetWebappOptions ().Uri
264265 }
265266
266- // Irrespective from the presence of a full `uri` in the payload (deprecated), resolve the remote root
267+ // Irrespective from the presence of a full `uri` in the payload (deprecated), validate the
268+ // remote is an OCM server and resolve the remote root
267269 // yet skip this if the remote is localhost (for integration tests)
268- if isLocalhost {
270+ if strings . Contains ( uri , "localhost" ) {
269271 protos = append (protos , ocmProto )
270272 continue
271273 }
272274 remoteRoot , err := discoverOcmRoot (r , protocolName )
273275 if err != nil {
274276 return nil , err
275277 }
276- uri , _ = url .JoinPath (remoteRoot , uri [strings .LastIndex (uri , "/" )+ 1 :])
277278
279+ uri , _ = url .JoinPath (remoteRoot , uri [strings .LastIndex (uri , "/" )+ 1 :])
278280 switch protocolName {
279281 case "webdav" :
280282 ocmProto .GetWebdavOptions ().Uri = uri
281283 case "webapp" :
282- ocmProto .GetWebappOptions ().UriTemplate = uri
284+ ocmProto .GetWebappOptions ().Uri = uri
283285 }
284286 protos = append (protos , ocmProto )
285287 }
286288
287289 return protos , nil
288290}
289291
290-
291292func discoverOcmRoot (r * http.Request , proto string ) (string , error ) {
292293 // implements the OCM discovery logic to fetch the root at the remote host that sent the share for the given proto, see
293294 // https://cs3org.github.io/OCM-API/docs.html?branch=v1.1.0&repo=OCM-API&user=cs3org#/paths/~1ocm-provider/get
0 commit comments