From 7df81621b1a3980a5f1c8a9de90e68ca5d56558a Mon Sep 17 00:00:00 2001
From: kujirahand <web@kujirahand.com>
Date: Fri, 7 Oct 2022 13:41:49 +0900
Subject: [PATCH] =?UTF-8?q?nako3edit=E3=81=AEapikey=E3=82=92=E9=95=B7?=
 =?UTF-8?q?=E3=81=8F=E3=81=97=E3=80=81=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=81=AE=E6=89=B1=E3=81=84=E3=82=92=E5=8E=B3=E6=A0=BC=E5=8C=96?=
 =?UTF-8?q?=20#1347?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/nako3edit/html/edit.html |  1 +
 tools/nako3edit/index.mjs      | 32 +++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/tools/nako3edit/html/edit.html b/tools/nako3edit/html/edit.html
index 186eae3f..825defe7 100644
--- a/tools/nako3edit/html/edit.html
+++ b/tools/nako3edit/html/edit.html
@@ -14,6 +14,7 @@
 #-----------
 APPKEY=""
 HREF=WINDOW["location"]["href"]
+HREFを表示
 P=HREFをURLパラメータ解析
 APPKEY=P["appkey"]
 Pを表示。
diff --git a/tools/nako3edit/index.mjs b/tools/nako3edit/index.mjs
index 6b0b8dcf..3fa24df4 100755
--- a/tools/nako3edit/index.mjs
+++ b/tools/nako3edit/index.mjs
@@ -20,7 +20,11 @@ const homeDir = process.env[isWin ? 'USERPROFILE' : 'HOME']
 const userDir = path.join(homeDir, 'nadesiko3_user')
 const CNAKO3 = path.resolve(path.join(__dirname, '../../src/cnako3.mjs'))
 const NODE = process.argv[0]
-const appkey = 'K' + Math.floor(Math.random() * 0xFFFFFFFF).toString(32) + Math.floor(Math.random() * 0xFFFFFFFF).toString(32)
+const appkey = 'k' +
+  Math.floor(Math.random() * 0xFFFFFFFF).toString(16) +
+  Math.floor(Math.random() * 0xFFFFFFFF).toString(16) +
+  Math.floor(Math.random() * 0xFFFFFFFF).toString(16) +
+  Math.floor(Math.random() * 0xFFFFFFFF).toString(16)
 
 // ユーザーフォルダを作成
 if (!fs.existsSync(userDir)) { fs.mkdirSync(userDir) }
@@ -159,7 +163,7 @@ function apiFiles (res) {
   res.end(JSON.stringify(files))
 }
 function apiLoad (res, params) {
-  const fname = removeFlag(params.file)
+  const fname = removePathFlag(params.file)
   const fullpath = path.join(userDir, fname)
   console.log('load=', fullpath)
   let text = '# 新規ファイル\n「こんにちは」と表示。'
@@ -176,7 +180,7 @@ function apiSave (res, params) {
     res.end('[ERROR] キーが違います')
     return
   }
-  const fname = removeFlag(params.file)
+  const fname = removePathFlag(params.file)
   const body = params.body
   const fullpath = path.join(userDir, fname)
   try {
@@ -190,9 +194,10 @@ function apiSave (res, params) {
   }
 }
 
-function removeFlag (s) {
+function removePathFlag (s) {
   // ファイル名をサニタイズ
   s = s.replace(/['"`\\?/<>*]/g, '_')
+  s = s.replace(/_{2,}/g, '') // '__'を削除
   return s
 }
 
@@ -203,7 +208,7 @@ function apiRun (res, params) {
     res.end('[ERROR] キーが違います')
     return
   }
-  const fname = removeFlag(params.file)
+  const fname = removePathFlag(params.file)
   const body = params.body
   const fullpath = path.join(userDir, fname)
   try {
@@ -233,24 +238,29 @@ function apiDelete (res, params) {
   res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' })
   const appkeyUser = params.appkey
   if (appkey !== appkeyUser) {
-    res.end('[ERROR] キーが違います')
+    res.end('"[ERROR] キーが違います"')
     return
   }
-  const fname = params.file
+  const fname = removePathFlag(params.file)
   const fullpath = path.join(userDir, fname)
   try {
-    fs.unlinkSync(fullpath)
-    res.end('"ok"')
+    if (fs.existsSync(fullpath)) {
+      fs.unlinkSync(fullpath)
+      res.end('"ok"')
+    } else {
+      res.end('"[ERROR] ファイルが見つかりません。"')
+    }
     return
   } catch (err) {
+    console.error(err)
     res.end('error:' + err.message)
   }
 }
 
 function apiGetNewFilename (res) {
   let fname = 'newfile.nako3'
-  for (let i = 1; i <= 999; i++) {
-    fname = `newfile${i}.nako3`
+  for (let i = 1; i <= 9999; i++) {
+    fname = `file${i}.nako3`
     const full = path.join(userDir, fname)
     if (fs.existsSync(full)) { continue }
     break