3 Commits

Author SHA1 Message Date
loveuer
a2589ee4b3 feat: add download limit and expiry control per upload (v0.7.0)
Some checks failed
Release Binaries / Build and Release (.exe, amd64, windows, windows-amd64) (push) Has been cancelled
Release Binaries / Build and Release (amd64, darwin, darwin-amd64) (push) Has been cancelled
Release Binaries / Build and Release (amd64, linux, linux-amd64) (push) Has been cancelled
Release Binaries / Build and Release (arm64, darwin, darwin-arm64) (push) Has been cancelled
Release Binaries / Build and Release (arm64, linux, linux-arm64) (push) Has been cancelled
Backend:
- model/meta.go: add MaxDownloads, ExpiresAt, Downloads fields
- opt/var.go: add X-Max-Downloads, X-Expires-In header constants; MinExpiresIn=30s, defaults
- controller/meta.go: New() accepts maxDownloads+expiresIn; CheckAndIncrDownload() validates expiry/limit and increments counter atomically; periodic cleanup for expired files
- handler/share.go: Fetch uses CheckAndIncrDownload (returns 410 on expired/limit exceeded); ShareNew and ShareAPIUpload read X-Max-Downloads/X-Expires-In headers

Frontend:
- upload.ts: UploadSettings interface; pass X-Max-Downloads and X-Expires-In headers on upload init
- panel-left.tsx: collapsible "高级设置" panel with download count (0-999) and expiry (1-24h) controls; show settings summary on upload success card

🤖 Generated with [Qoder][https://qoder.com]
2026-03-02 01:49:37 -08:00
loveuer
050075d9c8 feat: add top navbar to /share page, move nav links out of upload zone
Some checks failed
Release Binaries / Build and Release (.exe, amd64, windows, windows-amd64) (push) Has been cancelled
Release Binaries / Build and Release (amd64, darwin, darwin-amd64) (push) Has been cancelled
Release Binaries / Build and Release (amd64, linux, linux-amd64) (push) Has been cancelled
Release Binaries / Build and Release (arm64, darwin, darwin-arm64) (push) Has been cancelled
Release Binaries / Build and Release (arm64, linux, linux-arm64) (push) Has been cancelled
- Add NavBar component with app branding and conditional nav links
- NavBar shows "个人中心" for token_manage permission, "管理控制台" for user_manage
- Restructure share.tsx with flex column layout (NavBar + 3-column grid)
- Clean up panel-left.tsx: remove auth check, nav links, and unused styles

🤖 Generated with [Qoder][https://qoder.com]
2026-03-01 23:38:15 -08:00
loveuer
62e8acf757 refactor: remove GORM FK associations, handle relations in business layer (v0.6.1)
Some checks failed
Release Binaries / Build and Release (.exe, amd64, windows, windows-amd64) (push) Has been cancelled
Release Binaries / Build and Release (amd64, darwin, darwin-amd64) (push) Has been cancelled
Release Binaries / Build and Release (amd64, linux, linux-amd64) (push) Has been cancelled
Release Binaries / Build and Release (arm64, darwin, darwin-arm64) (push) Has been cancelled
Release Binaries / Build and Release (arm64, linux, linux-arm64) (push) Has been cancelled
- Remove Role association field from User model
- Remove User association field from Token model
- controller/user.go: query Role separately after loading User
- controller/token.go: query User and Role with separate DB calls
- handler/admin.go: introduce userResp type, build role info manually;
  batch-load roles in AdminListUsers to avoid N+1

🤖 Generated with [Qoder][https://qoder.com]
2026-02-28 01:56:56 -08:00
13 changed files with 561 additions and 190 deletions

View File

@@ -1,5 +1,9 @@
import { useState } from 'react'; import { useState } from 'react';
export interface UploadSettings {
maxDownloads: number; // 0 = unlimited
expiresIn: number; // seconds
}
interface UploadRes { interface UploadRes {
code: string code: string
@@ -10,18 +14,25 @@ export const useFileUpload = () => {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const uploadFile = async (file: File): Promise<string> => { const uploadFile = async (file: File, settings?: UploadSettings): Promise<string> => {
setLoading(true); setLoading(true);
setError(null); setError(null);
setProgress(0); setProgress(0);
const maxDownloads = settings?.maxDownloads ?? 3;
const expiresIn = settings?.expiresIn ?? 28800;
try { try {
const url = `/api/ushare/${file.name}`; const url = `/api/ushare/${file.name}`;
// 1. 初始化上传 // 1. 初始化上传
const res1 = await fetch(url, { const res1 = await fetch(url, {
method: "PUT", method: "PUT",
headers: {"X-File-Size": file.size.toString()} headers: {
"X-File-Size": file.size.toString(),
"X-Max-Downloads": maxDownloads.toString(),
"X-Expires-In": expiresIn.toString(),
}
}); });
if (!res1.ok) { if (!res1.ok) {
@@ -30,7 +41,6 @@ export const useFileUpload = () => {
window.location.href = "/login?next=/share" window.location.href = "/login?next=/share"
return "" return ""
} }
throw new Error("上传失败<1>"); throw new Error("上传失败<1>");
} }
@@ -64,15 +74,13 @@ export const useFileUpload = () => {
throw new Error(`上传失败<3>: ${err}`); throw new Error(`上传失败<3>: ${err}`);
} }
// 更新进度 const currentProgress = Math.round(((chunkIndex + 1) / totalChunks) * 100);
// const currentProgress = Number(((chunkIndex + 1) / totalChunks * 100).toFixed(2)); // 小数
const currentProgress = Math.round(((chunkIndex + 1) / totalChunks) * 100); // 整数 0-100
setProgress(currentProgress); setProgress(currentProgress);
} }
return code; return code;
} catch (err) { } catch (err) {
throw err; // 将错误继续抛出以便组件处理 throw err;
} finally { } finally {
setLoading(false); setLoading(false);
} }

View File

@@ -0,0 +1,81 @@
import React, {useEffect, useState} from 'react';
import {createUseStyles} from 'react-jss';
const useStyle = createUseStyles({
nav: {
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
padding: '0 24px',
height: '48px',
backgroundColor: '#2c9678',
boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
flexShrink: 0,
},
brand: {
color: 'white',
fontWeight: 700,
fontSize: '18px',
letterSpacing: '1px',
textDecoration: 'none',
},
links: {
display: 'flex',
gap: '8px',
alignItems: 'center',
},
link: {
color: 'rgba(255,255,255,0.9)',
fontSize: '13px',
textDecoration: 'none',
padding: '5px 12px',
borderRadius: '4px',
transition: 'background-color 0.2s',
'&:hover': {
backgroundColor: 'rgba(255,255,255,0.2)',
color: 'white',
},
},
divider: {
color: 'rgba(255,255,255,0.4)',
fontSize: '13px',
},
});
export const NavBar: React.FC = () => {
const style = useStyle();
const [isAdmin, setIsAdmin] = useState(false);
const [hasTokenPerm, setHasTokenPerm] = useState(false);
useEffect(() => {
fetch('/api/uauth/me').then(async res => {
if (res.ok) {
const json = await res.json();
const perms: string[] = json.data?.permissions ?? [];
setIsAdmin(perms.includes('user_manage'));
setHasTokenPerm(perms.includes('token_manage'));
}
}).catch(() => {});
}, []);
const showLinks = isAdmin || hasTokenPerm;
return (
<nav className={style.nav}>
<a href="/share" className={style.brand}>UShare</a>
{showLinks && (
<div className={style.links}>
{hasTokenPerm && (
<a href="/self" className={style.link}></a>
)}
{isAdmin && hasTokenPerm && (
<span className={style.divider}>|</span>
)}
{isAdmin && (
<a href="/admin" className={style.link}></a>
)}
</div>
)}
</nav>
);
};

View File

@@ -1,9 +1,9 @@
import {createUseStyles} from "react-jss"; import {createUseStyles} from "react-jss";
import {UButton} from "../../../component/button/u-button.tsx"; import {UButton} from "../../../component/button/u-button.tsx";
import React, {useEffect, useState} from "react"; import React, {useState} from "react";
import {useStore} from "../../../store/share.ts"; import {useStore} from "../../../store/share.ts";
import {message} from "../../../hook/message/u-message.tsx"; import {message} from "../../../hook/message/u-message.tsx";
import {useFileUpload} from "../../../api/upload.ts"; import {useFileUpload, UploadSettings} from "../../../api/upload.ts";
const useUploadStyle = createUseStyles({ const useUploadStyle = createUseStyles({
container: { container: {
@@ -60,21 +60,65 @@ const useUploadStyle = createUseStyles({
cursor: 'pointer', cursor: 'pointer',
'&:hover': {} '&:hover': {}
}, },
adminLink: { // Advanced settings
display: 'block', advToggle: {
textAlign: 'center',
marginTop: '16px', marginTop: '16px',
color: '#2c9678',
fontSize: '12px',
textDecoration: 'none',
opacity: 0.8,
'&:hover': {opacity: 1, textDecoration: 'underline'},
},
navLinks: {
display: 'flex', display: 'flex',
justifyContent: 'center', alignItems: 'center',
gap: '16px', gap: '6px',
marginTop: '16px', cursor: 'pointer',
color: '#2c9678',
fontSize: '13px',
userSelect: 'none',
opacity: 0.75,
'&:hover': {opacity: 1},
},
advPanel: {
marginTop: '12px',
padding: '14px 16px',
backgroundColor: 'rgba(255,255,255,0.5)',
borderRadius: '10px',
display: 'flex',
flexDirection: 'column',
gap: '12px',
},
advRow: {
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
gap: '12px',
},
advLabel: {
color: '#2c9678',
fontSize: '13px',
fontWeight: 500,
flexShrink: 0,
},
advInput: {
width: '80px',
padding: '5px 8px',
borderRadius: '5px',
border: '1px solid rgba(44,150,120,0.4)',
fontSize: '13px',
textAlign: 'center',
outline: 'none',
backgroundColor: 'rgba(255,255,255,0.8)',
'&:focus': {borderColor: '#2c9678'},
},
advSelect: {
padding: '5px 8px',
borderRadius: '5px',
border: '1px solid rgba(44,150,120,0.4)',
fontSize: '13px',
outline: 'none',
backgroundColor: 'rgba(255,255,255,0.8)',
color: '#333',
cursor: 'pointer',
'&:focus': {borderColor: '#2c9678'},
},
advHint: {
fontSize: '11px',
color: '#888',
}, },
}) })
@@ -179,38 +223,47 @@ const useShowStyle = createUseStyles({
fontSize: "12px", fontSize: "12px",
}, },
}, },
metaInfo: {
fontSize: '12px',
color: '#555',
marginTop: '10px',
display: 'flex',
gap: '16px',
flexWrap: 'wrap',
},
metaItem: {
display: 'flex',
alignItems: 'center',
gap: '4px',
},
}); });
// Expiry options (hours) shown in the dropdown
const EXPIRY_OPTIONS = [1, 2, 4, 8, 12, 24];
export const PanelLeft = () => { export const PanelLeft = () => {
const [code, set_code] = useState("") const [code, setCode] = useState("")
const [settings, setSettings] = useState<UploadSettings>({maxDownloads: 3, expiresIn: 8 * 3600})
if (code) { if (code) {
return <PanelLeftShow code={code} set_code={set_code} /> return <PanelLeftShow code={code} set_code={setCode} settings={settings}/>
} }
return <PanelLeftUpload set_code={set_code}/> return <PanelLeftUpload set_code={setCode} settings={settings} setSettings={setSettings}/>
}; };
const PanelLeftUpload: React.FC<{ set_code: (code:string) => void }> = ({set_code}) => { const PanelLeftUpload: React.FC<{
set_code: (code: string) => void;
settings: UploadSettings;
setSettings: (s: UploadSettings) => void;
}> = ({set_code, settings, setSettings}) => {
const style = useUploadStyle() const style = useUploadStyle()
const {file, setFile} = useStore() const {file, setFile} = useStore()
const {uploadFile, progress, loading} = useFileUpload(); const {uploadFile, progress, loading} = useFileUpload();
const [isAdmin, setIsAdmin] = useState(false); const [showAdv, setShowAdv] = useState(false);
const [hasTokenPerm, setHasTokenPerm] = useState(false);
useEffect(() => {
fetch('/api/uauth/me').then(async res => {
if (res.ok) {
const json = await res.json();
const perms: string[] = json.data?.permissions ?? [];
setIsAdmin(perms.includes('user_manage'));
setHasTokenPerm(perms.includes('token_manage'));
}
}).catch(() => {});
}, []);
function onFileSelect() { function onFileSelect() {
// @ts-ignore // @ts-expect-error no types for direct DOM query
document.querySelector('#real-file-input').click(); document.querySelector('#real-file-input').click();
} }
@@ -219,11 +272,8 @@ const PanelLeftUpload: React.FC<{ set_code: (code:string) => void }> = ({set_cod
} }
async function onFileUpload() { async function onFileUpload() {
if (!file) { if (!file) return;
return const code = await uploadFile(file, settings)
}
const code = await uploadFile(file)
set_code(code) set_code(code)
} }
@@ -231,40 +281,76 @@ const PanelLeftUpload: React.FC<{ set_code: (code:string) => void }> = ({set_cod
setFile(null) setFile(null)
} }
function onMaxDownloadsChange(e: React.ChangeEvent<HTMLInputElement>) {
let v = parseInt(e.target.value, 10);
if (isNaN(v) || v < 0) v = 0;
if (v > 999) v = 999;
setSettings({...settings, maxDownloads: v});
}
function onExpiryChange(e: React.ChangeEvent<HTMLSelectElement>) {
setSettings({...settings, expiresIn: parseInt(e.target.value, 10)});
}
return <div className={style.container}> return <div className={style.container}>
<div className={style.form}> <div className={style.form}>
<h2 className={style.title}></h2> <h2 className={style.title}></h2>
{ {!file && !loading && <UButton onClick={onFileSelect}></UButton>}
!file && !loading && {file && !loading && <UButton onClick={onFileUpload}></UButton>}
<UButton onClick={onFileSelect}></UButton> {loading && <UButton process={progress} loading={loading}></UButton>}
}
{
file && !loading &&
<UButton onClick={onFileUpload}></UButton>
}
{
loading &&
<UButton process={progress} loading={loading}></UButton>
}
<input type="file" className={style.file} id="real-file-input" onChange={onFileChange}/> <input type="file" className={style.file} id="real-file-input" onChange={onFileChange}/>
{ {file && (
file &&
<div className={style.preview}> <div className={style.preview}>
<div className={style.clean} onClick={onFileClean}>×</div> <div className={style.clean} onClick={onFileClean}>×</div>
<div className={style.name}>{file.name}</div> <div className={style.name}>{file.name}</div>
</div> </div>
}
{isAdmin && (
<a href="/admin" className={style.adminLink}></a>
)} )}
{hasTokenPerm && (
<a href="/self" className={style.adminLink}> / API Token</a> {/* Advanced settings toggle */}
<div className={style.advToggle} onClick={() => setShowAdv(v => !v)}>
<span>{showAdv ? '▾' : '▸'}</span>
<span></span>
</div>
{showAdv && (
<div className={style.advPanel}>
<div className={style.advRow}>
<span className={style.advLabel}></span>
<div style={{display: 'flex', alignItems: 'center', gap: '8px'}}>
<input
type="number"
min={0}
max={999}
className={style.advInput}
value={settings.maxDownloads}
onChange={onMaxDownloadsChange}
/>
<span className={style.advHint}>0 = </span>
</div>
</div>
<div className={style.advRow}>
<span className={style.advLabel}></span>
<select
className={style.advSelect}
value={settings.expiresIn}
onChange={onExpiryChange}
>
{EXPIRY_OPTIONS.map(h => (
<option key={h} value={h * 3600}>{h} </option>
))}
</select>
</div>
</div>
)} )}
</div> </div>
</div> </div>
} }
const PanelLeftShow: React.FC<{ code: string; set_code: (code: string) => void }> = ({ code, set_code }) => { const PanelLeftShow: React.FC<{
code: string;
set_code: (code: string) => void;
settings: UploadSettings;
}> = ({code, set_code, settings}) => {
const classes = useShowStyle(); const classes = useShowStyle();
const handleCopy = async () => { const handleCopy = async () => {
@@ -276,20 +362,18 @@ const PanelLeftShow: React.FC<{ code: string; set_code: (code: string) => void }
} }
}; };
const expiryHours = Math.round(settings.expiresIn / 3600);
const downloadLimit = settings.maxDownloads === 0 ? '不限' : `${settings.maxDownloads}`;
return ( return (
<div className={classes.container}> <div className={classes.container}>
<div className={classes.form}> <div className={classes.form}>
<button <button
className={classes.closeButton} className={classes.closeButton}
onClick={() => set_code('')} onClick={() => set_code('')}
aria-label="关闭" aria-label="关闭"
> >×</button>
× <h2 className={classes.title}>!</h2>
</button>
<h2 className={classes.title}>
!
</h2>
<div className={classes.codeWrapper}> <div className={classes.codeWrapper}>
<pre className={classes.pre}> <pre className={classes.pre}>
@@ -299,6 +383,11 @@ const PanelLeftShow: React.FC<{ code: string; set_code: (code: string) => void }
</button> </button>
</pre> </pre>
</div> </div>
<div className={classes.metaInfo}>
<span className={classes.metaItem}>{downloadLimit}</span>
<span className={classes.metaItem}>{expiryHours} </span>
</div>
</div> </div>
</div> </div>
); );

View File

@@ -2,17 +2,23 @@ import {createUseStyles} from 'react-jss'
import {PanelLeft} from "./component/panel-left.tsx"; import {PanelLeft} from "./component/panel-left.tsx";
import {PanelRight} from "./component/panel-right.tsx"; import {PanelRight} from "./component/panel-right.tsx";
import {PanelMid} from "./component/panel-mid.tsx"; import {PanelMid} from "./component/panel-mid.tsx";
import {NavBar} from "./component/nav-bar.tsx";
const useStyle = createUseStyles({ const useStyle = createUseStyles({
"@global": { "@global": {
margin: 0, margin: 0,
padding: 0, padding: 0,
}, },
wrapper: {
display: 'flex',
flexDirection: 'column',
height: '100vh',
},
container: { container: {
margin: 0, flex: 1,
height: "100vh",
display: "grid", display: "grid",
gridTemplateColumns: "40% 20% 40%", gridTemplateColumns: "40% 20% 40%",
overflow: 'hidden',
"@media (max-width: 768px)": { "@media (max-width: 768px)": {
gridTemplateColumns: "100%", gridTemplateColumns: "100%",
@@ -24,9 +30,14 @@ const useStyle = createUseStyles({
export const FileSharing = () => { export const FileSharing = () => {
const style = useStyle() const style = useStyle()
return <div className={style.container}> return (
<div className={style.wrapper}>
<NavBar />
<div className={style.container}>
<PanelLeft /> <PanelLeft />
<PanelMid /> <PanelMid />
<PanelRight/> <PanelRight />
</div> </div>
</div>
);
}; };

View File

@@ -3,17 +3,19 @@ package controller
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/loveuer/nf/nft/log"
"github.com/loveuer/ushare/internal/model"
"github.com/loveuer/ushare/internal/opt"
gonanoid "github.com/matoous/go-nanoid/v2"
"github.com/spf13/viper"
"io" "io"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"sync" "sync"
"time" "time"
gonanoid "github.com/matoous/go-nanoid/v2"
"github.com/loveuer/nf/nft/log"
"github.com/loveuer/ushare/internal/model"
"github.com/loveuer/ushare/internal/opt"
"github.com/pkg/errors"
"github.com/spf13/viper"
) )
type metaInfo struct { type metaInfo struct {
@@ -24,13 +26,15 @@ type metaInfo struct {
size int64 size int64
cursor int64 cursor int64
user string user string
maxDownloads int
expiresAt int64
} }
func (m *metaInfo) generateMeta(code string) error { func (m *metaInfo) generateMeta(code string) error {
content := fmt.Sprintf("filename=%s\ncreated_at=%d\nsize=%d\nuploader=%s", content := fmt.Sprintf(
m.name, m.create.UnixMilli(), m.size, m.user, "filename=%s\ncreated_at=%d\nsize=%d\nuploader=%s\nmax_downloads=%d\nexpires_at=%d\ndownloads=0",
m.name, m.create.UnixMilli(), m.size, m.user, m.maxDownloads, m.expiresAt,
) )
return os.WriteFile(opt.MetaPath(code), []byte(content), 0644) return os.WriteFile(opt.MetaPath(code), []byte(content), 0644)
} }
@@ -46,8 +50,19 @@ var (
const letters = "1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ" const letters = "1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ"
func (m *meta) New(size int64, filename, ip string) (string, error) { // New creates a new upload session.
// maxDownloads: 0 = unlimited; expiresIn: seconds from now (minimum opt.MinExpiresIn).
func (m *meta) New(size int64, filename, ip string, maxDownloads int, expiresIn int64) (string, error) {
now := time.Now() now := time.Now()
if expiresIn < opt.MinExpiresIn {
expiresIn = opt.DefaultExpiresIn
}
if maxDownloads < 0 {
maxDownloads = 0
}
code, err := gonanoid.Generate(letters, opt.CodeLength) code, err := gonanoid.Generate(letters, opt.CodeLength)
if err != nil { if err != nil {
return "", err return "", err
@@ -66,7 +81,17 @@ func (m *meta) New(size int64, filename, ip string) (string, error) {
m.Lock() m.Lock()
defer m.Unlock() defer m.Unlock()
m.m[code] = &metaInfo{f: f, name: filename, last: now, size: size, cursor: 0, create: now, user: ip} m.m[code] = &metaInfo{
f: f,
name: filename,
last: now,
size: size,
cursor: 0,
create: now,
user: ip,
maxDownloads: maxDownloads,
expiresAt: now.Unix() + expiresIn,
}
return code, nil return code, nil
} }
@@ -100,6 +125,67 @@ func (m *meta) Write(code string, start, end int64, reader io.Reader) (total, cu
return total, cursor, nil return total, cursor, nil
} }
// CheckAndIncrDownload reads the meta file, validates expiry and download limit,
// increments the download counter, and writes the meta file back.
// Returns the meta on success, or an error if the file is unavailable.
func (m *meta) CheckAndIncrDownload(code string) (*model.Meta, error) {
m.Lock()
defer m.Unlock()
metaPath := opt.MetaPath(code)
v := viper.New()
v.SetConfigFile(metaPath)
v.SetConfigType("env")
if err := v.ReadInConfig(); err != nil {
return nil, errors.New("文件不存在或已过期")
}
info := new(model.Meta)
if err := v.Unmarshal(info); err != nil {
return nil, errors.New("文件元数据损坏")
}
now := time.Now().Unix()
// Check expiry
if info.ExpiresAt > 0 && now > info.ExpiresAt {
// Clean up expired files
go func() {
_ = os.RemoveAll(opt.FilePath(code))
_ = os.RemoveAll(metaPath)
}()
return nil, errors.New("文件已过期")
}
// Check download limit
if info.MaxDownloads > 0 && info.Downloads >= info.MaxDownloads {
return nil, errors.New("文件下载次数已达上限")
}
// Increment downloads and write back
info.Downloads++
content := fmt.Sprintf(
"filename=%s\ncreated_at=%d\nsize=%d\nuploader=%s\nmax_downloads=%d\nexpires_at=%d\ndownloads=%d",
info.Filename, info.CreatedAt, info.Size, info.Uploader,
info.MaxDownloads, info.ExpiresAt, info.Downloads,
)
if err := os.WriteFile(metaPath, []byte(content), 0644); err != nil {
log.Warn("meta.CheckAndIncrDownload: write back failed: %s", err.Error())
}
// If this was the last allowed download, clean up after serving
if info.MaxDownloads > 0 && info.Downloads >= info.MaxDownloads {
go func() {
time.Sleep(5 * time.Second)
_ = os.RemoveAll(opt.FilePath(code))
_ = os.RemoveAll(metaPath)
}()
}
return info, nil
}
func (m *meta) Start(ctx context.Context) { func (m *meta) Start(ctx context.Context) {
ticker := time.NewTicker(time.Minute) ticker := time.NewTicker(time.Minute)
m.ctx = ctx m.ctx = ctx
@@ -108,7 +194,7 @@ func (m *meta) Start(ctx context.Context) {
log.Fatal("controller.MetaManager.Start: mkdir datapath failed, path = %s, err = %s", opt.Cfg.DataPath, err.Error()) log.Fatal("controller.MetaManager.Start: mkdir datapath failed, path = %s, err = %s", opt.Cfg.DataPath, err.Error())
} }
// 清理 2 分钟内没有继续上传的 part // Clean uploads with no activity for 2 minutes
go func() { go func() {
for { for {
select { select {
@@ -133,7 +219,7 @@ func (m *meta) Start(ctx context.Context) {
} }
}() }()
// 清理一天前的文件 // Clean expired files by walking the data directory
go func() { go func() {
if opt.Cfg.CleanInterval <= 0 { if opt.Cfg.CleanInterval <= 0 {
log.Warn("meta.Clean: no clean interval set, plz clean manual!!!") log.Warn("meta.Clean: no clean interval set, plz clean manual!!!")
@@ -148,12 +234,10 @@ func (m *meta) Start(ctx context.Context) {
case <-ctx.Done(): case <-ctx.Done():
return return
case now := <-ticker.C: case now := <-ticker.C:
//log.Debug("meta.Clean: 开始清理过期文件 = %v", duration)
_ = filepath.Walk(opt.Cfg.DataPath, func(path string, info os.FileInfo, err error) error { _ = filepath.Walk(opt.Cfg.DataPath, func(path string, info os.FileInfo, err error) error {
if info == nil { if info == nil {
return nil return nil
} }
if info.IsDir() { if info.IsDir() {
return nil return nil
} }
@@ -163,36 +247,33 @@ func (m *meta) Start(ctx context.Context) {
return nil return nil
} }
viper.SetConfigFile(path) v := viper.New()
viper.SetConfigType("env") v.SetConfigFile(path)
if err = viper.ReadInConfig(); err != nil { v.SetConfigType("env")
// todo log if err = v.ReadInConfig(); err != nil {
return nil return nil
} }
mi := new(model.Meta) mi := new(model.Meta)
if err = v.Unmarshal(mi); err != nil {
if err = viper.Unmarshal(mi); err != nil {
// todo log
return nil return nil
} }
code := strings.TrimPrefix(name, ".meta.") code := strings.TrimPrefix(name, ".meta.")
// Remove if past explicit expiry
if mi.ExpiresAt > 0 && now.Unix() > mi.ExpiresAt {
log.Debug("controller.meta: file expired, code = %s", code)
_ = os.RemoveAll(opt.FilePath(code))
_ = os.RemoveAll(path)
return nil
}
// Remove if past global clean interval
if now.Sub(time.UnixMilli(mi.CreatedAt)) > duration { if now.Sub(time.UnixMilli(mi.CreatedAt)) > duration {
log.Debug("controller.meta: file out of date, code = %s", code)
log.Debug("controller.meta: file out of date, code = %s, user_key = %s", code, mi.Uploader) _ = os.RemoveAll(opt.FilePath(code))
_ = os.RemoveAll(path)
if err = os.RemoveAll(opt.FilePath(code)); err != nil {
log.Warn("meta.Clean: remove file failed, file = %s, err = %s", opt.FilePath(code), err.Error())
}
if err = os.RemoveAll(path); err != nil {
log.Warn("meta.Clean: remove file failed, file = %s, err = %s", path, err.Error())
}
m.Lock()
delete(m.m, code)
m.Unlock()
} }
return nil return nil

View File

@@ -65,13 +65,7 @@ func (tm *tokenManager) Delete(userID uint, tokenID uint) error {
// Verify looks up a DB API token and returns a Session if valid. // Verify looks up a DB API token and returns a Session if valid.
func (tm *tokenManager) Verify(rawToken string) (*model.Session, error) { func (tm *tokenManager) Verify(rawToken string) (*model.Session, error) {
var t model.Token var t model.Token
err := db.Default.Session(). if err := db.Default.Session().Where("token = ?", rawToken).First(&t).Error; err != nil {
Where("token = ?", rawToken).
Preload("User").
Preload("User.Role").
First(&t).Error
if err != nil {
return nil, errors.New("无效的 API Token") return nil, errors.New("无效的 API Token")
} }
@@ -79,16 +73,30 @@ func (tm *tokenManager) Verify(rawToken string) (*model.Session, error) {
return nil, errors.New("API Token 已过期") return nil, errors.New("API Token 已过期")
} }
var user model.User
if err := db.Default.Session().First(&user, t.UserID).Error; err != nil {
return nil, errors.New("Token 关联用户不存在")
}
if !user.Active {
return nil, errors.New("账号已被禁用")
}
var role model.Role
if err := db.Default.Session().First(&role, user.RoleID).Error; err != nil {
return nil, errors.New("账号角色异常")
}
// Update last_used_at asynchronously // Update last_used_at asynchronously
now := time.Now() now := time.Now()
go db.Default.Session().Model(&t).Update("last_used_at", now) //nolint:errcheck go db.Default.Session().Model(&t).Update("last_used_at", now) //nolint:errcheck
session := &model.Session{ session := &model.Session{
UserID: t.User.ID, UserID: user.ID,
Username: t.User.Username, Username: user.Username,
Role: t.User.Role.Name, Role: role.Name,
RoleLabel: t.User.Role.Label, RoleLabel: role.Label,
Permissions: t.User.Role.PermissionList(), Permissions: role.PermissionList(),
LoginAt: now.Unix(), LoginAt: now.Unix(),
Token: rawToken, Token: rawToken,
} }

View File

@@ -89,7 +89,6 @@ func (um *userManager) Login(username, password string) (*model.Session, error)
user := new(model.User) user := new(model.User)
if err := db.Default.Session(). if err := db.Default.Session().
Where("username = ? AND active = ?", username, true). Where("username = ? AND active = ?", username, true).
Preload("Role").
First(user).Error; err != nil { First(user).Error; err != nil {
return nil, errors.New("账号或密码错误") return nil, errors.New("账号或密码错误")
} }
@@ -98,12 +97,17 @@ func (um *userManager) Login(username, password string) (*model.Session, error)
return nil, errors.New("账号或密码错误") return nil, errors.New("账号或密码错误")
} }
var role model.Role
if err := db.Default.Session().First(&role, user.RoleID).Error; err != nil {
return nil, errors.New("账号角色异常,请联系管理员")
}
session := &model.Session{ session := &model.Session{
UserID: user.ID, UserID: user.ID,
Username: user.Username, Username: user.Username,
Role: user.Role.Name, Role: role.Name,
RoleLabel: user.Role.Label, RoleLabel: role.Label,
Permissions: user.Role.PermissionList(), Permissions: role.PermissionList(),
LoginAt: now.Unix(), LoginAt: now.Unix(),
Token: tool.RandomString(32), Token: tool.RandomString(32),
} }

View File

@@ -3,6 +3,7 @@ package handler
import ( import (
"net/http" "net/http"
"strings" "strings"
"time"
"github.com/loveuer/nf" "github.com/loveuer/nf"
"github.com/loveuer/nf/nft/log" "github.com/loveuer/nf/nft/log"
@@ -12,14 +13,65 @@ import (
"github.com/spf13/cast" "github.com/spf13/cast"
) )
// userResp is the JSON response shape for a user including role info,
// built manually at the business layer instead of relying on GORM associations.
type userResp struct {
ID uint `json:"id"`
Username string `json:"username"`
RoleID uint `json:"role_id"`
Role model.Role `json:"role"`
Active bool `json:"active"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
}
func toUserResp(u model.User, r model.Role) userResp {
return userResp{
ID: u.ID,
Username: u.Username,
RoleID: u.RoleID,
Role: r,
Active: u.Active,
CreatedAt: u.CreatedAt,
UpdatedAt: u.UpdatedAt,
}
}
func AdminListUsers() nf.HandlerFunc { func AdminListUsers() nf.HandlerFunc {
return func(c *nf.Ctx) error { return func(c *nf.Ctx) error {
var users []model.User var users []model.User
if err := db.Default.Session().Preload("Role").Find(&users).Error; err != nil { if err := db.Default.Session().Find(&users).Error; err != nil {
log.Error("handler.AdminListUsers: %s", err.Error()) log.Error("handler.AdminListUsers: %s", err.Error())
return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "查询失败"}) return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "查询失败"})
} }
return c.Status(http.StatusOK).JSON(map[string]any{"data": users})
// Collect unique role IDs and query them in one shot
roleIDSet := make(map[uint]struct{})
for _, u := range users {
roleIDSet[u.RoleID] = struct{}{}
}
roleIDs := make([]uint, 0, len(roleIDSet))
for id := range roleIDSet {
roleIDs = append(roleIDs, id)
}
var roles []model.Role
if err := db.Default.Session().Where("id IN ?", roleIDs).Find(&roles).Error; err != nil {
log.Error("handler.AdminListUsers: query roles: %s", err.Error())
return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "查询失败"})
}
roleMap := make(map[uint]model.Role, len(roles))
for _, r := range roles {
roleMap[r.ID] = r
}
resp := make([]userResp, 0, len(users))
for _, u := range users {
resp = append(resp, toUserResp(u, roleMap[u.RoleID]))
}
return c.Status(http.StatusOK).JSON(map[string]any{"data": resp})
} }
} }
@@ -57,6 +109,11 @@ func AdminCreateUser() nf.HandlerFunc {
return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "用户名已存在"}) return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "用户名已存在"})
} }
var role model.Role
if err := db.Default.Session().First(&role, req.RoleID).Error; err != nil {
return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "无效的角色"})
}
user := &model.User{ user := &model.User{
Username: req.Username, Username: req.Username,
Password: tool.NewPassword(req.Password), Password: tool.NewPassword(req.Password),
@@ -69,11 +126,7 @@ func AdminCreateUser() nf.HandlerFunc {
return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "创建用户失败"}) return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "创建用户失败"})
} }
if err := db.Default.Session().Preload("Role").First(user, user.ID).Error; err != nil { return c.Status(http.StatusOK).JSON(map[string]any{"data": toUserResp(*user, role)})
log.Error("handler.AdminCreateUser: preload role: %s", err.Error())
}
return c.Status(http.StatusOK).JSON(map[string]any{"data": user})
} }
} }
@@ -97,11 +150,16 @@ func AdminUpdateUser() nf.HandlerFunc {
session := c.Locals("user").(*model.Session) session := c.Locals("user").(*model.Session)
user := new(model.User) var user model.User
if err := db.Default.Session().Preload("Role").First(user, id).Error; err != nil { if err := db.Default.Session().First(&user, id).Error; err != nil {
return c.Status(http.StatusNotFound).JSON(map[string]string{"msg": "用户不存在"}) return c.Status(http.StatusNotFound).JSON(map[string]string{"msg": "用户不存在"})
} }
var currentRole model.Role
if err := db.Default.Session().First(&currentRole, user.RoleID).Error; err != nil {
return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "查询角色失败"})
}
updates := map[string]any{} updates := map[string]any{}
if req.RoleID != nil && *req.RoleID != user.RoleID { if req.RoleID != nil && *req.RoleID != user.RoleID {
@@ -110,7 +168,7 @@ func AdminUpdateUser() nf.HandlerFunc {
return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "无效的角色"}) return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "无效的角色"})
} }
// If demoting from admin, ensure at least one other active admin remains // If demoting from admin, ensure at least one other active admin remains
if user.Role.Name == model.RoleAdmin && newRole.Name != model.RoleAdmin { if currentRole.Name == model.RoleAdmin && newRole.Name != model.RoleAdmin {
var adminCount int64 var adminCount int64
db.Default.Session().Model(&model.User{}). db.Default.Session().Model(&model.User{}).
Where("role_id = ? AND active = ? AND id != ?", user.RoleID, true, id). Where("role_id = ? AND active = ? AND id != ?", user.RoleID, true, id).
@@ -120,13 +178,14 @@ func AdminUpdateUser() nf.HandlerFunc {
} }
} }
updates["role_id"] = *req.RoleID updates["role_id"] = *req.RoleID
currentRole = newRole
} }
if req.Active != nil && *req.Active != user.Active { if req.Active != nil && *req.Active != user.Active {
if user.ID == session.UserID && !*req.Active { if user.ID == session.UserID && !*req.Active {
return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "不能禁用自己的账号"}) return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "不能禁用自己的账号"})
} }
if user.Role.Name == model.RoleAdmin && !*req.Active { if currentRole.Name == model.RoleAdmin && !*req.Active {
var adminCount int64 var adminCount int64
db.Default.Session().Model(&model.User{}). db.Default.Session().Model(&model.User{}).
Where("role_id = ? AND active = ? AND id != ?", user.RoleID, true, id). Where("role_id = ? AND active = ? AND id != ?", user.RoleID, true, id).
@@ -149,16 +208,12 @@ func AdminUpdateUser() nf.HandlerFunc {
return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "没有需要更新的字段"}) return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "没有需要更新的字段"})
} }
if err := db.Default.Session().Model(user).Updates(updates).Error; err != nil { if err := db.Default.Session().Model(&user).Updates(updates).Error; err != nil {
log.Error("handler.AdminUpdateUser: %s", err.Error()) log.Error("handler.AdminUpdateUser: %s", err.Error())
return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "更新失败"}) return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "更新失败"})
} }
if err := db.Default.Session().Preload("Role").First(user, user.ID).Error; err != nil { return c.Status(http.StatusOK).JSON(map[string]any{"data": toUserResp(user, currentRole)})
log.Error("handler.AdminUpdateUser: preload: %s", err.Error())
}
return c.Status(http.StatusOK).JSON(map[string]any{"data": user})
} }
} }
@@ -174,13 +229,18 @@ func AdminDeleteUser() nf.HandlerFunc {
return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "不能删除自己的账号"}) return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "不能删除自己的账号"})
} }
user := new(model.User) var user model.User
if err := db.Default.Session().Preload("Role").First(user, id).Error; err != nil { if err := db.Default.Session().First(&user, id).Error; err != nil {
return c.Status(http.StatusNotFound).JSON(map[string]string{"msg": "用户不存在"}) return c.Status(http.StatusNotFound).JSON(map[string]string{"msg": "用户不存在"})
} }
// Prevent deleting the last admin // Prevent deleting the last admin: check via role name
if user.Role.Name == model.RoleAdmin { var userRole model.Role
if err := db.Default.Session().First(&userRole, user.RoleID).Error; err != nil {
return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "查询角色失败"})
}
if userRole.Name == model.RoleAdmin {
var adminCount int64 var adminCount int64
db.Default.Session().Model(&model.User{}). db.Default.Session().Model(&model.User{}).
Where("role_id = ? AND id != ?", user.RoleID, id). Where("role_id = ? AND id != ?", user.RoleID, id).
@@ -190,7 +250,7 @@ func AdminDeleteUser() nf.HandlerFunc {
} }
} }
if err := db.Default.Session().Delete(user).Error; err != nil { if err := db.Default.Session().Delete(&user).Error; err != nil {
log.Error("handler.AdminDeleteUser: %s", err.Error()) log.Error("handler.AdminDeleteUser: %s", err.Error())
return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "删除失败"}) return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "删除失败"})
} }

View File

@@ -10,35 +10,26 @@ import (
"github.com/loveuer/nf" "github.com/loveuer/nf"
"github.com/loveuer/nf/nft/log" "github.com/loveuer/nf/nft/log"
"github.com/loveuer/ushare/internal/controller" "github.com/loveuer/ushare/internal/controller"
"github.com/loveuer/ushare/internal/model"
"github.com/loveuer/ushare/internal/opt" "github.com/loveuer/ushare/internal/opt"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cast" "github.com/spf13/cast"
"github.com/spf13/viper"
) )
func Fetch() nf.HandlerFunc { func Fetch() nf.HandlerFunc {
return func(c *nf.Ctx) error { return func(c *nf.Ctx) error {
code := c.Param("code") code := c.Param("code")
log.Debug("handler.Fetch: code = %s", code) log.Debug("handler.Fetch: code = %s", code)
info := new(model.Meta)
_, err := os.Stat(opt.MetaPath(code)) if _, err := os.Stat(opt.MetaPath(code)); err != nil {
if err != nil {
if errors.Is(err, os.ErrNotExist) { if errors.Is(err, os.ErrNotExist) {
return c.Status(http.StatusNotFound).JSON(map[string]string{"msg": "文件不存在"}) return c.Status(http.StatusNotFound).JSON(map[string]string{"msg": "文件不存在"})
} }
return c.SendStatus(http.StatusInternalServerError) return c.SendStatus(http.StatusInternalServerError)
} }
viper.SetConfigFile(opt.MetaPath(code)) info, err := controller.MetaManager.CheckAndIncrDownload(code)
viper.SetConfigType("env") if err != nil {
if err = viper.ReadInConfig(); err != nil { return c.Status(http.StatusGone).JSON(map[string]string{"msg": err.Error()})
return c.SendStatus(http.StatusInternalServerError)
}
if err = viper.Unmarshal(info); err != nil {
return c.SendStatus(http.StatusInternalServerError)
} }
c.SetHeader("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, info.Filename)) c.SetHeader("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, info.Filename))
@@ -60,7 +51,21 @@ func ShareNew() nf.HandlerFunc {
return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "miss header: " + opt.HeaderSize}) return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "miss header: " + opt.HeaderSize})
} }
code, err := controller.MetaManager.New(size, filename, c.IP()) maxDownloads := opt.DefaultMaxDownloads
if v := c.Get(opt.HeaderMaxDownload); v != "" {
if n, err := cast.ToIntE(v); err == nil && n >= 0 {
maxDownloads = n
}
}
expiresIn := int64(opt.DefaultExpiresIn)
if v := c.Get(opt.HeaderExpiresIn); v != "" {
if n, err := cast.ToInt64E(v); err == nil && n >= opt.MinExpiresIn {
expiresIn = n
}
}
code, err := controller.MetaManager.New(size, filename, c.IP(), maxDownloads, expiresIn)
if err != nil { if err != nil {
return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": ""}) return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": ""})
} }
@@ -120,7 +125,7 @@ func ShareUpload() nf.HandlerFunc {
// ShareAPIUpload handles one-step file upload via API token. // ShareAPIUpload handles one-step file upload via API token.
// PUT /api/v1/upload/:filename // PUT /api/v1/upload/:filename
// Accepts the raw file body and Content-Length header, returns the download code. // Optional headers: X-Max-Downloads, X-Expires-In (seconds).
func ShareAPIUpload() nf.HandlerFunc { func ShareAPIUpload() nf.HandlerFunc {
return func(c *nf.Ctx) error { return func(c *nf.Ctx) error {
filename := strings.TrimSpace(c.Param("filename")) filename := strings.TrimSpace(c.Param("filename"))
@@ -133,7 +138,21 @@ func ShareAPIUpload() nf.HandlerFunc {
return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "Content-Length header required"}) return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "Content-Length header required"})
} }
code, err := controller.MetaManager.New(size, filename, c.IP()) maxDownloads := opt.DefaultMaxDownloads
if v := c.Get(opt.HeaderMaxDownload); v != "" {
if n, err := cast.ToIntE(v); err == nil && n >= 0 {
maxDownloads = n
}
}
expiresIn := int64(opt.DefaultExpiresIn)
if v := c.Get(opt.HeaderExpiresIn); v != "" {
if n, err := cast.ToInt64E(v); err == nil && n >= opt.MinExpiresIn {
expiresIn = n
}
}
code, err := controller.MetaManager.New(size, filename, c.IP(), maxDownloads, expiresIn)
if err != nil { if err != nil {
return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "create upload failed"}) return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": "create upload failed"})
} }

View File

@@ -5,4 +5,7 @@ type Meta struct {
CreatedAt int64 `json:"created_at" mapstructure:"created_at"` CreatedAt int64 `json:"created_at" mapstructure:"created_at"`
Size int64 `json:"size" mapstructure:"size"` Size int64 `json:"size" mapstructure:"size"`
Uploader string `json:"uploader" mapstructure:"uploader"` Uploader string `json:"uploader" mapstructure:"uploader"`
MaxDownloads int `json:"max_downloads" mapstructure:"max_downloads"`
ExpiresAt int64 `json:"expires_at" mapstructure:"expires_at"`
Downloads int `json:"downloads" mapstructure:"downloads"`
} }

View File

@@ -7,7 +7,6 @@ import "time"
type Token struct { type Token struct {
ID uint `gorm:"primarykey" json:"id"` ID uint `gorm:"primarykey" json:"id"`
UserID uint `gorm:"not null;index" json:"user_id"` UserID uint `gorm:"not null;index" json:"user_id"`
User User `gorm:"foreignKey:UserID" json:"-"`
Name string `gorm:"not null" json:"name"` Name string `gorm:"not null" json:"name"`
Token string `gorm:"uniqueIndex;not null" json:"-"` Token string `gorm:"uniqueIndex;not null" json:"-"`
CreatedAt time.Time `json:"created_at"` CreatedAt time.Time `json:"created_at"`

View File

@@ -8,7 +8,6 @@ type User struct {
Username string `gorm:"uniqueIndex;not null" json:"username"` Username string `gorm:"uniqueIndex;not null" json:"username"`
Password string `gorm:"not null" json:"-"` Password string `gorm:"not null" json:"-"`
RoleID uint `gorm:"not null" json:"role_id"` RoleID uint `gorm:"not null" json:"role_id"`
Role Role `gorm:"foreignKey:RoleID" json:"role"`
Active bool `gorm:"default:true" json:"active"` Active bool `gorm:"default:true" json:"active"`
CreatedAt time.Time `json:"created_at"` CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"` UpdatedAt time.Time `json:"updated_at"`

View File

@@ -5,7 +5,16 @@ import "path/filepath"
const ( const (
Meta = ".meta." Meta = ".meta."
HeaderSize = "X-File-Size" HeaderSize = "X-File-Size"
HeaderMaxDownload = "X-Max-Downloads"
HeaderExpiresIn = "X-Expires-In"
CodeLength = 8 CodeLength = 8
// MinExpiresIn is the minimum allowed expiry in seconds (30s for testing).
MinExpiresIn = 30
// DefaultExpiresIn is the default expiry in seconds (8 hours).
DefaultExpiresIn = 8 * 3600
// DefaultMaxDownloads is the default max download count (0 = unlimited).
DefaultMaxDownloads = 3
) )
func FilePath(code string) string { func FilePath(code string) string {