New Fling with new API
All checks were successful
continuous-integration/drone/push Build is passing

Only a crude implementation for now
This commit is contained in:
Armin Friedl 2020-07-20 00:27:02 +02:00
parent 3860ed9177
commit c07a7866ce
Signed by: armin
GPG key ID: 48C726EEE7FBCBC8
3 changed files with 259 additions and 229 deletions

View file

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

View file

@ -69,6 +69,11 @@ public class AuthorizationService {
} }
public boolean allowFlingAccessByShareId(String shareId, AbstractAuthenticationToken token) { 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); FlingEntity flingEntity = flingRepository.findByShareId(shareId);
if(flingEntity == null) { throw new EntityNotFoundException("No entity for shareId="+shareId); } if(flingEntity == null) { throw new EntityNotFoundException("No entity for shareId="+shareId); }
return allowFlingAccess(flingEntity.getId(), token); return allowFlingAccess(flingEntity.getId(), token);

View file

@ -1,242 +1,267 @@
import log from 'loglevel'; import log from 'loglevel';
import React, {useState} from 'react'; import React, { useState } from 'react';
import {flingClient} from '../../util/flingclient'; import { FlingClient, fc } from '../../util/fc';
export default function New(props) { export default function New(props) {
let defaultState = () => ({name: "", authCode: "", let defaultState = () => ({
sharing: {directDownload: true, allowUpload: false, shared: true, shareUrl: ""}, name: "", authCode: "",
expiration: {}}); sharing: { directDownload: true, allowUpload: false, shared: true, shareUrl: "" },
expiration: {}
});
let [fling, setFling] = useState(defaultState()); let [fling, setFling] = useState(defaultState());
let [shareUrlUnique, setShareUrlUnique] = useState(true); let [shareUrlUnique, setShareUrlUnique] = useState(true);
function toggleSharing(ev) { function toggleSharing(ev) {
let f = {...fling}; let f = { ...fling };
let s = {...fling.sharing}; let s = { ...fling.sharing };
if(ev.currentTarget.id === "direct-download") { if (ev.currentTarget.id === "direct-download") {
if(ev.currentTarget.checked) { if (ev.currentTarget.checked) {
s.directDownload = true; s.directDownload = true;
s.shared = true; s.shared = true;
s.allowUpload = false; s.allowUpload = false;
} else { } else {
s.directDownload = false; s.directDownload = false;
} }
} else if(ev.currentTarget.id === "allow-upload") { } else if (ev.currentTarget.id === "allow-upload") {
if(ev.currentTarget.checked) { if (ev.currentTarget.checked) {
s.allowUpload = true; s.allowUpload = true;
s.shared = true; s.shared = true;
s.directDownload = false; s.directDownload = false;
} else { } else {
s.allowUpload = false; s.allowUpload = false;
} }
} else if(ev.currentTarget.id === "shared") { } else if (ev.currentTarget.id === "shared") {
if(!ev.currentTarget.checked) { if (!ev.currentTarget.checked) {
s.allowUpload = s.directDownload = s.shared = false; s.allowUpload = s.directDownload = s.shared = false;
} else { } else {
s.shared = true; s.shared = true;
} }
}
f.sharing = s;
setFling(f);
}
function handleClose(ev) {
if (ev) ev.preventDefault(); // this is needed, otherwise a submit event is fired
props.closeModalFn();
}
function setShareUrl(ev) {
let f = { ...fling };
let s = { ...fling.sharing }; //TODO: expiration is not cloned
let value = ev.currentTarget.value;
if (!value) {
setShareUrlUnique(false);
s.shareUrl = value;
f.sharing = s;
setFling(f);
return;
}
const flingClient = new FlingClient();
flingClient.getFlingByShareId(ev.currentTarget.value)
.then(result => {
setShareUrlUnique(false);
}).catch(error => {
if(error.status === 404) {
setShareUrlUnique(true);
} }
}).finally(() => {
s.shareUrl = value;
f.sharing = s; f.sharing = s;
setFling(f); setFling(f);
});
}
function setName(ev) {
let f = { ...fling };
let value = ev.currentTarget.value;
f.name = value;
setFling(f);
}
function setExpirationType(ev) {
let f = { ...fling };
let e = { ...fling.expiration }; //TODO: sharing is not cloned
let value = ev.currentTarget.value;
if (value === "never") {
e = {};
} else {
e.type = value;
e.value = "";
} }
function handleClose(ev) { f.expiration = e;
if(ev) ev.preventDefault(); // this is needed, otherwise a submit event is fired setFling(f);
props.closeModalFn(); }
function setExpirationValue(ev) {
let f = { ...fling };
let e = { ...fling.expiration }; //TODO: sharing is not cloned
let value = e.type === "time" ? ev.currentTarget.valueAsNumber : ev.currentTarget.value;
e.value = value;
f.expiration = e;
setFling(f);
}
function formatExpirationTime() {
if (!fling.expiration || !fling.expiration.value || fling.expiration.type !== "time")
return "";
let date = new Date(fling.expiration.value);
let fmt = date.toISOString().split("T")[0];
return fmt;
}
function setAuthCode(ev) {
let f = { ...fling };
let value = ev.currentTarget.value;
f.authCode = value;
setFling(f);
}
function handleSubmit(ev) {
ev.preventDefault();
log.info("Creating new filing");
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;
}
} }
function setShareUrl(ev) { flingClient.postFling({fling: flingEntity})
let f = {...fling}; .then(() => handleClose())
let s = {...fling.sharing}; //TODO: expiration is not cloned .catch(error => log.error(error))
let value = ev.currentTarget.value; }
if(!value) { return (
setShareUrlUnique(false); <div className={`modal ${props.active ? "active" : ""}`}>
s.shareUrl = value; <div className="modal-overlay" aria-label="Close" onClick={handleClose}></div>
f.sharing = s; <div className="modal-container">
setFling(f); <div className="modal-header">
return; <div className="modal-title h5">New Fling</div>
}
flingClient.getFlingByShareId(ev.currentTarget.value)
.then(result => {
if(!result) {
setShareUrlUnique(true);
} else {
setShareUrlUnique(false);
}
s.shareUrl = value;
f.sharing = s;
setFling(f);
});
}
function setName(ev) {
let f = {...fling};
let value = ev.currentTarget.value;
f.name = value;
setFling(f);
}
function setExpirationType(ev) {
let f = {...fling};
let e = {...fling.expiration}; //TODO: sharing is not cloned
let value = ev.currentTarget.value;
if(value === "never") {
e = {};
} else {
e.type = value;
e.value = "";
}
f.expiration = e;
setFling(f);
}
function setExpirationValue(ev) {
let f = {...fling};
let e = {...fling.expiration}; //TODO: sharing is not cloned
let value = e.type === "time" ? ev.currentTarget.valueAsNumber: ev.currentTarget.value;
e.value = value;
f.expiration = e;
setFling(f);
}
function formatExpirationTime() {
if (!fling.expiration || !fling.expiration.value || fling.expiration.type !== "time")
return "";
let date = new Date(fling.expiration.value);
let fmt = date.toISOString().split("T")[0];
return fmt;
}
function setAuthCode(ev) {
let f = {...fling};
let value = ev.currentTarget.value;
f.authCode = value;
setFling(f);
}
function handleSubmit(ev) {
ev.preventDefault();
log.info("Creating new filing");
log.info(fling);
flingClient.postFling(fling);
handleClose();
}
return(
<div className={`modal ${props.active ? "active": ""}`}>
<div className="modal-overlay" aria-label="Close" onClick={handleClose}></div>
<div className="modal-container">
<div className="modal-header">
<div className="modal-title h5">New Fling</div>
</div>
<div className="modal-body">
<form className="form-horizontal" onSubmit={handleSubmit}>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label" htmlFor="input-name">Name</label>
</div>
<div className="col-9 col-sm-12">
<input className="form-input" type="text" id="input-name" value={fling.name} onChange={setName}/>
</div>
</div>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label" htmlFor="input-share-url">Share URL</label>
</div>
<div className="col-9 col-sm-12">
<input className="form-input" type="text" id="input-share-url" value={fling.sharing.shareUrl} onChange={setShareUrl} />
<i className={`icon icon-cross text-error ${shareUrlUnique ? "d-hide": "d-visible"}`} />
</div>
</div>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label" htmlFor="input-passcode">Passcode</label>
</div>
<div className="col-9 col-sm-12">
<div className="input-group">
<input className="form-input" type="text" value={fling.authCode} onChange={setAuthCode} />
<label className="form-switch ml-2 tooltip tooltip-left" data-tooltip={fling.authCode ? "Clear passcode to\ndisable protection": "Set passcode to\nenable protection"} >
<input type="checkbox" checked={!!fling.authCode} readOnly />
<i className="form-icon" /> Protected
</label>
</div>
</div>
</div>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label">Expiration</label>
</div>
<div className="col-9 col-sm-12">
<div className="form-group">
<select className="form-select" value={fling.expiration.type} onChange={setExpirationType}>
<option value="never">Never</option>
<option value="time">Date</option>
<option value="clicks">Clicks</option>
</select>
</div>
<div className={fling.expiration.type === "clicks" ? "d-visible": "d-hide"}>
<div className="input-group">
<span className="input-group-addon">Expire after</span>
<input className="form-input" type="number" value={fling.expiration.value || ""} onChange={setExpirationValue} />
<span className="input-group-addon">Clicks</span>
</div>
</div>
<div className={fling.expiration.type === "time" ? "d-visible": "d-hide"}>
<div className="input-group">
<span className="input-group-addon">Expire after</span>
<input className="form-input" type="date" value={formatExpirationTime()} onChange={setExpirationValue} />
</div>
</div>
</div>
</div>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label">Settings</label>
</div>
<div className="col-9 col-sm-12">
<label className="form-switch form-inline">
<input type="checkbox" id="shared" checked={fling.sharing.shared} onChange={toggleSharing}/>
<i className="form-icon" /> Shared
</label>
<label className="form-switch form-inline">
<input type="checkbox" id="allow-upload" checked={fling.sharing.allowUpload} onChange={toggleSharing}/>
<i className="form-icon" /> Uploads
</label>
<label className="form-switch form-inline">
<input type="checkbox" id="direct-download" checked={fling.sharing.directDownload} onChange={toggleSharing}/>
<i className="form-icon" /> Direct Download
</label>
</div>
</div>
<div className="float-right">
<button className="btn btn-secondary mr-2" onClick={handleClose}>Cancel</button>
<input type="submit" className="btn btn-primary" value="Save" />
</div>
</form>
</div>
</div>
</div> </div>
); <div className="modal-body">
<form className="form-horizontal" onSubmit={handleSubmit}>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label" htmlFor="input-name">Name</label>
</div>
<div className="col-9 col-sm-12">
<input className="form-input" type="text" id="input-name" value={fling.name} onChange={setName} />
</div>
</div>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label" htmlFor="input-share-url">Share URL</label>
</div>
<div className="col-9 col-sm-12">
<input className="form-input" type="text" id="input-share-url" value={fling.sharing.shareUrl} onChange={setShareUrl} />
<i className={`icon icon-cross text-error ${shareUrlUnique ? "d-hide" : "d-visible"}`} />
</div>
</div>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label" htmlFor="input-passcode">Passcode</label>
</div>
<div className="col-9 col-sm-12">
<div className="input-group">
<input className="form-input" type="text" value={fling.authCode} onChange={setAuthCode} />
<label className="form-switch ml-2 tooltip tooltip-left" data-tooltip={fling.authCode ? "Clear passcode to\ndisable protection" : "Set passcode to\nenable protection"} >
<input type="checkbox" checked={!!fling.authCode} readOnly />
<i className="form-icon" /> Protected
</label>
</div>
</div>
</div>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label">Expiration</label>
</div>
<div className="col-9 col-sm-12">
<div className="form-group">
<select className="form-select" value={fling.expiration.type} onChange={setExpirationType}>
<option value="never">Never</option>
<option value="time">Date</option>
<option value="clicks">Clicks</option>
</select>
</div>
<div className={fling.expiration.type === "clicks" ? "d-visible" : "d-hide"}>
<div className="input-group">
<span className="input-group-addon">Expire after</span>
<input className="form-input" type="number" value={fling.expiration.value || ""} onChange={setExpirationValue} />
<span className="input-group-addon">Clicks</span>
</div>
</div>
<div className={fling.expiration.type === "time" ? "d-visible" : "d-hide"}>
<div className="input-group">
<span className="input-group-addon">Expire after</span>
<input className="form-input" type="date" value={formatExpirationTime()} onChange={setExpirationValue} />
</div>
</div>
</div>
</div>
<div className="form-group">
<div className="col-3 col-sm-12">
<label className="form-label">Settings</label>
</div>
<div className="col-9 col-sm-12">
<label className="form-switch form-inline">
<input type="checkbox" id="shared" checked={fling.sharing.shared} onChange={toggleSharing} />
<i className="form-icon" /> Shared
</label>
<label className="form-switch form-inline">
<input type="checkbox" id="allow-upload" checked={fling.sharing.allowUpload} onChange={toggleSharing} />
<i className="form-icon" /> Uploads
</label>
<label className="form-switch form-inline">
<input type="checkbox" id="direct-download" checked={fling.sharing.directDownload} onChange={toggleSharing} />
<i className="form-icon" /> Direct Download
</label>
</div>
</div>
<div className="float-right">
<button className="btn btn-secondary mr-2" onClick={handleClose}>Cancel</button>
<input type="submit" className="btn btn-primary" value="Save" />
</div>
</form>
</div>
</div>
</div>
);
} }