attic/fling
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

0.1 #1

Merged
armin merged 30 commits from 0.1 into master 2020-07-26 00:51:55 +00:00
Conversation 0 Commits 30 Files changed 114 +259 -229
3 changed files with 259 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c07a7866ce - Show all commits

8
service/fling/src/main/java/net/friedl/fling/security/FlingWebSecurityConfigurer.java
View file

@ -77,14 +77,14 @@ public class FlingWebSecurityConfigurer extends WebSecurityConfigurerAdapter {
/***********************************/
/** Authorization for: /api/fling **/
/***********************************/
.authorizeRequests()
.antMatchers(HttpMethod.GET, "/api/fling/{flingId}/**")
.access("@authorizationService.allowFlingAccess(#flingId, authentication)")
.and()
.authorizeRequests()
.antMatchers(HttpMethod.GET, "/api/fling/share/{shareId}")
.access("@authorizationService.allowFlingAccessByShareId(#shareId, authentication)")
.and()
.authorizeRequests()
.antMatchers(HttpMethod.GET, "/api/fling/{flingId}/**")
.access("@authorizationService.allowFlingAccess(#flingId, authentication)")
.and()
.authorizeRequests()
.antMatchers(HttpMethod.POST, "/api/fling/{flingId}/artifact")
.access("@authorizationService.allowUpload(#flingId, authentication)")

5
service/fling/src/main/java/net/friedl/fling/service/AuthorizationService.java
View file

@ -69,6 +69,11 @@ public class AuthorizationService {
}
public boolean allowFlingAccessByShareId(String shareId, AbstractAuthenticationToken token) {
if (FlingAuthorities.FLING_ADMIN.verify(token)) {
log.debug("Owner authorized for fling access [shareId = {}]", shareId);
return true;
}
FlingEntity flingEntity = flingRepository.findByShareId(shareId);
if(flingEntity == null) { throw new EntityNotFoundException("No entity for shareId="+shareId); }
return allowFlingAccess(flingEntity.getId(), token);

45
web/fling/src/components/admin/New.jsx
View file

@ -1,12 +1,14 @@
import log from 'loglevel';
import React, { useState } from 'react';
import {flingClient} from '../../util/flingclient';
import { FlingClient, fc } from '../../util/fc';
export default function New(props) {
let defaultState = () => ({name: "", authCode: "",
let defaultState = () => ({
name: "", authCode: "",
sharing: { directDownload: true, allowUpload: false, shared: true, shareUrl: "" },
expiration: {}});
expiration: {}
});
let [fling, setFling] = useState(defaultState());
let [shareUrlUnique, setShareUrlUnique] = useState(true);
@ -62,14 +64,15 @@ export default function New(props) {
return;
}
const flingClient = new FlingClient();
flingClient.getFlingByShareId(ev.currentTarget.value)
.then(result => {
if(!result) {
setShareUrlUnique(true);
} else {
setShareUrlUnique(false);
}).catch(error => {
if(error.status === 404) {
setShareUrlUnique(true);
}
}).finally(() => {
s.shareUrl = value;
f.sharing = s;
setFling(f);
@ -132,9 +135,31 @@ export default function New(props) {
function handleSubmit(ev) {
ev.preventDefault();
log.info("Creating new filing");
log.info(fling);
flingClient.postFling(fling);
handleClose();
const flingClient = new FlingClient();
let flingEntity = new fc.Fling(fling.name);
flingEntity.directDownload = fling.sharing.directDownload;
flingEntity.allowUpload = fling.sharing.allowUpload;
flingEntity.shared = fling.sharing.shared;
flingEntity.shareId = fling.sharing.shareUrl;
flingEntity.authCode = fling.authCode;
if (fling.expiration.type) {
switch (fling.expiration.type) {
case "time":
flingEntity.expirationTime = fling.expiration.value;
break;
case "clicks":
flingEntity.expirationClicks = fling.expiration.value;
break;
default:
log.warn("Unknown expiration type");
break;
}
}
flingClient.postFling({fling: flingEntity})
.then(() => handleClose())
.catch(error => log.error(error))
}
return (