-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from TeamSekai/feature/offset
offsetを指定可能に
- Loading branch information
Showing
3 changed files
with
145 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,139 +1,156 @@ | ||
| import fs from "fs/promises"; | ||
| import path from "path"; | ||
| import express from "express"; | ||
| import fs from 'fs/promises'; | ||
| import path from 'path'; | ||
| import express from 'express'; | ||
| import cors from 'cors'; | ||
| let router = express.Router(); | ||
| import { config, getDirectoryEntries } from "@packages/common"; | ||
| const filesDir = path.resolve(import.meta.dirname, "../../", config.filesDir); | ||
| const prvDir = path.resolve(import.meta.dirname, "../../", config.prvDir); | ||
| import { config, getDirectoryEntries } from '@packages/common'; | ||
| const filesDir = path.resolve(import.meta.dirname, '../../', config.filesDir); | ||
| const prvDir = path.resolve(import.meta.dirname, '../../', config.prvDir); | ||
| import passport from 'passport'; | ||
| import passportHttp from 'passport-http'; | ||
| import fileUpload from "express-fileupload"; | ||
| import ipRangeCheck from "ip-range-check"; | ||
| import fileUpload from 'express-fileupload'; | ||
| import ipRangeCheck from 'ip-range-check'; | ||
|
|
||
| router.use((req, res, next) => { | ||
| next(); | ||
| }) | ||
| next(); | ||
| }); | ||
|
|
||
| router.use('/', fileUpload()); | ||
|
|
||
| router.use(cors()); | ||
|
|
||
| router.use(async (req, res, next) => { | ||
| if (req.method != "GET") return next(); | ||
| if (req.path.startsWith("/api/files")) return next(); | ||
| try { | ||
| res.json(await getDirectoryEntries(decodeURIComponent(req.path).slice(1).split("/").slice(1).join("/"))); | ||
| } catch (e) { | ||
| res.sendStatus(404); | ||
| } | ||
| }) | ||
| if (req.method != 'GET') return next(); | ||
| if (req.path.startsWith('/api/files')) return next(); | ||
| const offset = Number(req.query.offset); | ||
| try { | ||
| let files = await getDirectoryEntries( | ||
| decodeURIComponent(req.path).slice(1).split('/').slice(1).join('/') | ||
| ); | ||
| if (!isNaN(offset)) { | ||
| files = files.slice(offset, offset + 10); | ||
| } | ||
| res.json(files); | ||
| } catch (e) { | ||
| console.log(e); | ||
| res.sendStatus(404); | ||
| } | ||
| }); | ||
|
|
||
| /** | ||
| * @param {fileUpload.UploadedFile} file | ||
| * @param {string} uploadDir | ||
| * @param {fileUpload.UploadedFile} file | ||
| * @param {string} uploadDir | ||
| */ | ||
| function uploadFile(file, uploadDir) { | ||
| return new Promise(async (resolve, reject) => { | ||
| let filePath = path.join(uploadDir, file.name); | ||
| let extName = path.extname(file.name); | ||
| let baseName = path.basename(file.name, extName); | ||
| let files = await fs.readdir(uploadDir); | ||
| let newFileName = file.name; | ||
| let count = 1; | ||
| while (files.includes(newFileName)) { | ||
| newFileName = `${baseName}_${count}${extName}`; | ||
| count++; | ||
| } | ||
| filePath = path.join(uploadDir, newFileName); | ||
| try { | ||
| await fs.writeFile(filePath, file.data); | ||
| resolve({ | ||
| path: filePath | ||
| }); | ||
| } catch { | ||
| reject(); | ||
| } | ||
| }) | ||
| return new Promise(async (resolve, reject) => { | ||
| let filePath = path.join(uploadDir, file.name); | ||
| let extName = path.extname(file.name); | ||
| let baseName = path.basename(file.name, extName); | ||
| let files = await fs.readdir(uploadDir); | ||
| let newFileName = file.name; | ||
| let count = 1; | ||
| while (files.includes(newFileName)) { | ||
| newFileName = `${baseName}_${count}${extName}`; | ||
| count++; | ||
| } | ||
| filePath = path.join(uploadDir, newFileName); | ||
| try { | ||
| await fs.writeFile(filePath, file.data); | ||
| resolve({ | ||
| path: filePath, | ||
| }); | ||
| } catch { | ||
| reject(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| passport.use(new passportHttp.BasicStrategy( | ||
| function (username, password, done) { | ||
| if (username == config.uploadUserName && password == config.uploadPassword) { | ||
| return done(null, true); | ||
| } else { | ||
| return done(null, false); | ||
| } | ||
| } | ||
| )); | ||
| passport.use( | ||
| new passportHttp.BasicStrategy(function (username, password, done) { | ||
| if ( | ||
| username == config.uploadUserName && | ||
| password == config.uploadPassword | ||
| ) { | ||
| return done(null, true); | ||
| } else { | ||
| return done(null, false); | ||
| } | ||
| }) | ||
| ); | ||
|
|
||
| function str2bool(str) { | ||
| if (typeof str != 'string') { | ||
| return Boolean(str); | ||
| } | ||
| try { | ||
| var obj = JSON.parse(str.toLowerCase()); | ||
| return obj == true; | ||
| } catch (e) { | ||
| return str != ''; | ||
| } | ||
| if (typeof str != 'string') { | ||
| return Boolean(str); | ||
| } | ||
| try { | ||
| var obj = JSON.parse(str.toLowerCase()); | ||
| return obj == true; | ||
| } catch (e) { | ||
| return str != ''; | ||
| } | ||
| } | ||
|
|
||
| async function directoryExists(uploadDir) { | ||
| console.log(uploadDir); | ||
| try { | ||
| await fs.stat(uploadDir); | ||
| return true; | ||
| } catch { | ||
| return false; | ||
| } | ||
| console.log(uploadDir); | ||
| try { | ||
| await fs.stat(uploadDir); | ||
| return true; | ||
| } catch { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| router.post("/upload-discord", async (req, res) => { | ||
| let file = req.files.file; | ||
| if (!file) return res.status(400); | ||
| let uploadDir = str2bool(req.query["private"]) ? prvDir : filesDir; | ||
| if (!await directoryExists(uploadDir)) { | ||
| return res.sendStatus(404); | ||
| } | ||
| let check = ipRangeCheck(req.ip, [ | ||
| "127.0.0.1/8",//ループバックアドレス | ||
| "::1/128",//ループバックアドレス(IPv6) | ||
| "10.0.0.0/8",//プライベートIP | ||
| "172.16.0.0/12",//プライベートIP | ||
| "192.168.0.0/16",//プライベートIP | ||
| "fc00::/7",//プライベートIP(IPv6) | ||
| ...config.trustedIPs | ||
| ]); | ||
| if (!check) return res.sendStatus(403); | ||
| router.post('/upload-discord', async (req, res) => { | ||
| let file = req.files.file; | ||
| if (!file) return res.status(400); | ||
| let uploadDir = str2bool(req.query['private']) ? prvDir : filesDir; | ||
| if (!(await directoryExists(uploadDir))) { | ||
| return res.sendStatus(404); | ||
| } | ||
| let check = ipRangeCheck(req.ip, [ | ||
| '127.0.0.1/8', //ループバックアドレス | ||
| '::1/128', //ループバックアドレス(IPv6) | ||
| '10.0.0.0/8', //プライベートIP | ||
| '172.16.0.0/12', //プライベートIP | ||
| '192.168.0.0/16', //プライベートIP | ||
| 'fc00::/7', //プライベートIP(IPv6) | ||
| ...config.trustedIPs, | ||
| ]); | ||
| if (!check) return res.sendStatus(403); | ||
|
|
||
| try { | ||
| let result = await uploadFile(file, uploadDir) | ||
| res.status(200).send({ | ||
| fileName: path.basename(result.path) | ||
| }); | ||
| } catch { | ||
| res.status(500).send({ | ||
| success: false, | ||
| error: "Failed to Upload" | ||
| }); | ||
| } | ||
| try { | ||
| let result = await uploadFile(file, uploadDir); | ||
| res.status(200).send({ | ||
| fileName: path.basename(result.path), | ||
| }); | ||
| } catch { | ||
| res.status(500).send({ | ||
| success: false, | ||
| error: 'Failed to Upload', | ||
| }); | ||
| } | ||
| }); | ||
|
|
||
| router.post("/upload", passport.authenticate('basic', { session: false }), async (req, res) => { | ||
| if (!req.query.path) return res.status(400); | ||
| let file = req.files?.file; | ||
| if (!file) return res.status(400); | ||
| let uploadDir = path.join(filesDir, decodeURIComponent(req.query.path)); | ||
| if (!await directoryExists(uploadDir)) { | ||
| return res.sendStatus(404); | ||
| } | ||
| try { | ||
| let result = await uploadFile(file, uploadDir) | ||
| res.status(200).send({ | ||
| fileName: path.basename(result.path) | ||
| }); | ||
| } catch { | ||
| res.sendStatus(500); | ||
| } | ||
| }) | ||
|
|
||
| router.post( | ||
| '/upload', | ||
| passport.authenticate('basic', { session: false }), | ||
| async (req, res) => { | ||
| if (!req.query.path) return res.status(400); | ||
| let file = req.files?.file; | ||
| if (!file) return res.status(400); | ||
| let uploadDir = path.join(filesDir, decodeURIComponent(req.query.path)); | ||
| if (!(await directoryExists(uploadDir))) { | ||
| return res.sendStatus(404); | ||
| } | ||
| try { | ||
| let result = await uploadFile(file, uploadDir); | ||
| res.status(200).send({ | ||
| fileName: path.basename(result.path), | ||
| }); | ||
| } catch { | ||
| res.sendStatus(500); | ||
| } | ||
| } | ||
| ); | ||
|
|
||
| export default router | ||
| export default router; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters