From 0c95096cb9fb5804543d716187c04a5c5085e83a Mon Sep 17 00:00:00 2001 From: witersen <1801168257@qq.com> Date: Thu, 12 May 2022 11:31:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E4=B8=8D=E5=90=8CSu?= =?UTF-8?q?bversion=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7=EF=BC=88=E9=92=88?= =?UTF-8?q?=E5=AF=B9Subversion=201.9=E5=8F=8A=E4=BB=A5=E4=B8=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 01.web/src/views/repositoryInfo/index.vue | 23 ++++-- 02.php/api.php | 6 +- 02.php/app/service/Common.php | 8 +- 02.php/app/service/Mail.php | 6 +- 02.php/app/service/Svn.php | 4 +- 02.php/app/service/Svnrep.php | 7 +- 02.php/app/util/SVNAdmin/Rep.php | 15 +++- 02.php/config/database.php | 46 ++++++------ 02.php/config/svn.php | 11 ++- 02.php/config/update.php | 18 ++--- 02.php/server/install.php | 91 +++++++++++++++++++++-- 02.php/server/svnadmind.php | 8 +- 12 files changed, 176 insertions(+), 67 deletions(-) diff --git a/01.web/src/views/repositoryInfo/index.vue b/01.web/src/views/repositoryInfo/index.vue index 7c48a06..c082563 100644 --- a/01.web/src/views/repositoryInfo/index.vue +++ b/01.web/src/views/repositoryInfo/index.vue @@ -249,6 +249,14 @@ > + 请注意当前的文件下载方案采用 + StreamSaver +
+ 如要获取良好的下载体验，请为站点配置HTTPS - 如需将自己常用的钩子显示在此处

- 以新增 pre-commit 功能为例，操作步骤如下：

- 1、在 /home/svnadmin/hooks/ 目录下创建任意名称的文件夹
- 2、创建文件 hookDescription 并写入此钩子的主要功能描述
- 3、创建文件 hookName 并写入钩子的类型 pre-commit
- 4、创建文件 pre-commit 并写入钩子内容
+ 如需将自己常用的钩子显示在此处

+ 以新增 pre-commit 功能为例，操作步骤如下：

+ 1、在 /home/svnadmin/hooks/ 目录下创建任意名称的文件夹
+ 2、创建文件 hookDescription 并写入此钩子的主要功能描述
+ 3、创建文件 hookName 并写入钩子的类型 pre-commit
+ 4、创建文件 pre-commit 并写入钩子内容
 @@ -2563,7 +2572,7 @@ export default { */ ViewRecommendHook(hookName) { var temp = this.recommendHooks.filter( - (item) => item.hookName = hookName + (item) => (item.hookName = hookName) ); //设置当前选中的内容到输入框 this.tempSelectRepHookRecommend = temp[0].hookContent; diff --git a/02.php/api.php b/02.php/api.php index e0374c0..a34f4a2 100644 --- a/02.php/api.php +++ b/02.php/api.php @@ -3,12 +3,14 @@ * @Author: witersen * @Date: 2022-04-24 23:37:06 * @LastEditors: witersen - * @LastEditTime: 2022-05-09 21:11:05 + * @LastEditTime: 2022-05-11 23:48:29 * @Description: QQ:1801168257 */ /** * 需要PHP版本大于等于5.5同时小于8.0 + * + * 不考虑扩展的情况下，本系统兼容php 5.4 ，但是由于 phpmailer 插件的引入需要兼容 php 5.4 */ /** @@ -96,6 +98,8 @@ foreach ($disable_functions as $disable) { //检测守护进程状态 $state = FunDetectState(); +// echo $state; +// return; if ($state == 0) { json1(401, 0, '守护进程响应超时'); } else if ($state == 2) { diff --git a/02.php/app/service/Common.php b/02.php/app/service/Common.php index 8e345a4..7f22eca 100644 --- a/02.php/app/service/Common.php +++ b/02.php/app/service/Common.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-04-24 23:37:05 * @LastEditors: witersen - * @LastEditTime: 2022-05-10 14:43:54 + * @LastEditTime: 2022-05-12 00:01:12 * @Description: QQ:1801168257 */ @@ -101,8 +101,8 @@ class Common extends Base //日志 $this->Logs->InsertLog( '用户登录', - sprintf("账号 %s IP地址", $this->payload['user_name'], $_SERVER["REMOTE_ADDR"]), - $this->userName + sprintf("账号 %s IP地址 %s", $this->payload['user_name'], $_SERVER["REMOTE_ADDR"]), + $this->payload['user_name'] ); //邮件 @@ -131,7 +131,7 @@ class Common extends Base //日志 $this->Logs->InsertLog( '用户注销', - sprintf("账号 %s IP地址", $this->userName, $_SERVER["REMOTE_ADDR"]), + sprintf("账号 %s IP地址 %s", $this->userName, $_SERVER["REMOTE_ADDR"]), $this->userName ); diff --git a/02.php/app/service/Mail.php b/02.php/app/service/Mail.php index 7107419..5644d12 100644 --- a/02.php/app/service/Mail.php +++ b/02.php/app/service/Mail.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-04-24 23:37:05 * @LastEditors: witersen - * @LastEditTime: 2022-05-10 14:31:29 + * @LastEditTime: 2022-05-11 15:48:55 * @Description: QQ:1801168257 */ @@ -284,11 +284,11 @@ class Mail extends Base $message_push = $this->GetPush(); $message_push = $message_push['data']; - $triggers = array_column($message_push, 'trigger'); + $triggers = FunArrayColumn($message_push, 'trigger'); if (!in_array($trigger, $triggers)) { return message(200, 0, '触发条件不存在'); } - $options = array_combine($triggers, array_column($message_push, 'enable')); + $options = array_combine($triggers, FunArrayColumn($message_push, 'enable')); if (!$options[$trigger]) { return message(200, 0, '触发条件未开启'); } diff --git a/02.php/app/service/Svn.php b/02.php/app/service/Svn.php index 1578b99..65bd86b 100644 --- a/02.php/app/service/Svn.php +++ b/02.php/app/service/Svn.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-04-24 23:37:05 * @LastEditors: witersen - * @LastEditTime: 2022-05-11 02:15:44 + * @LastEditTime: 2022-05-12 00:20:14 * @Description: QQ:1801168257 */ @@ -25,7 +25,7 @@ class Svn extends Base $result = $result['result']; if ($result == '') { - return message(200, 0, 'svnserve服务未在运行，SVN用户将无法使用系统的仓库在线内容浏览功能'); + return message(200, 0, 'svnserve服务未在运行，出于安全原因，SVN用户将无法使用系统的仓库在线内容浏览功能，其它功能不受影响'); } else { return message(); } diff --git a/02.php/app/service/Svnrep.php b/02.php/app/service/Svnrep.php index 2379fc6..a69a54e 100644 --- a/02.php/app/service/Svnrep.php +++ b/02.php/app/service/Svnrep.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-04-24 23:37:05 * @LastEditors: witersen - * @LastEditTime: 2022-05-11 15:24:12 + * @LastEditTime: 2022-05-12 00:51:04 * @Description: QQ:1801168257 */ @@ -62,9 +62,12 @@ class Svnrep extends Base $cmd = sprintf("export LC_CTYPE=en_US.UTF-8 && '%s' create " . $this->config_svn['rep_base_path'] . $this->payload['rep_name'], $this->config_bin['svnadmin']); FunShellExec($cmd); + //关闭selinux + FunShellExec('setenforce 0'); + if ($this->payload['rep_type'] == '2') { //以指定的目录结构初始化仓库 - $this->SVNAdminRep->InitRepStruct($this->config_svn['templete_init_struct'], $this->config_svn['rep_base_path'] . $this->payload['rep_name']); + $this->SVNAdminRep->InitRepStruct($this->config_svn['templete_init_struct_01'], $this->config_svn['rep_base_path'] . $this->payload['rep_name']); } //检查是否创建成功 diff --git a/02.php/app/util/SVNAdmin/Rep.php b/02.php/app/util/SVNAdmin/Rep.php index 5604b14..78b0a04 100644 --- a/02.php/app/util/SVNAdmin/Rep.php +++ b/02.php/app/util/SVNAdmin/Rep.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-04-27 15:45:45 * @LastEditors: witersen - * @LastEditTime: 2022-05-09 16:58:20 + * @LastEditTime: 2022-05-12 11:09:39 * @Description: QQ:1801168257 * @copyright: https://github.com/witersen/ */ @@ -869,6 +869,8 @@ class Rep extends Core * FSFS Shard Size * FSFS Shards Packed * FSFS Logical Addressing + * + * 此函数暂未使用因为包含兼容性问题 需要 Subversion > 1.9 */ function GetRepInfo($repName) { @@ -1199,12 +1201,19 @@ class Rep extends Core /** * 获取仓库的修订版本数量 * svnadmin info + * + * Subversion 1.9 及以前没有 svnadmin info 子指令 + * 因此使用 svnlook youngest 来代替 */ function GetRepRev($repName) { - $cmd = sprintf("'%s' info '%s' | grep 'Revisions' | awk '{print $2}'", $this->config_bin['svnadmin'], $this->config_svn['rep_base_path'] . $repName); + // $cmd = sprintf("'%s' info '%s' | grep 'Revisions' | awk '{print $2}'", $this->config_bin['svnadmin'], $this->config_svn['rep_base_path'] . $repName); + + $cmd = sprintf("'%s' youngest '%s'", $this->config_bin['svnlook'], $this->config_svn['rep_base_path'] . $repName); + $result = FunShellExec($cmd); - return (int)$result['result']; + + return (int)trim($result['result']); } /** diff --git a/02.php/config/database.php b/02.php/config/database.php index 7d677bb..af0ac0f 100644 --- a/02.php/config/database.php +++ b/02.php/config/database.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-05-07 00:38:48 * @LastEditors: witersen - * @LastEditTime: 2022-05-10 10:51:59 + * @LastEditTime: 2022-05-11 18:24:28 * @Description: QQ:1801168257 */ @@ -11,24 +11,24 @@ * for MySQL * config from Medoo 1.7.10 */ -return [ - 'database_type' => 'mysql', - 'server' => 'sas2.witersen.com', - 'database_name' => 'svnadmin', - 'username' => 'svnadmin', - 'password' => 'svnadmin', - 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_general_ci', - 'port' => 3306, - 'prefix' => '', - 'logging' => false, - 'option' => [ - PDO::ATTR_CASE => PDO::CASE_NATURAL - ], - 'command' => [ - 'SET SQL_MODE=ANSI_QUOTES' - ] -]; +// return [ +// 'database_type' => 'mysql', +// 'server' => 'localhost', +// 'database_name' => 'svnadmin', +// 'username' => 'svnadmin', +// 'password' => 'svnadmin', +// 'charset' => 'utf8mb4', +// 'collation' => 'utf8mb4_general_ci', +// 'port' => 3306, +// 'prefix' => '', +// 'logging' => false, +// 'option' => [ +// PDO::ATTR_CASE => PDO::CASE_NATURAL +// ], +// 'command' => [ +// 'SET SQL_MODE=ANSI_QUOTES' +// ] +// ]; /** * for SQLite @@ -37,7 +37,7 @@ return [ * %s 为占位符 无需修改 */ -// return [ -// 'database_type' => 'sqlite', -// 'database_file' => '%ssvnadmin.db' -// ]; +return [ + 'database_type' => 'sqlite', + 'database_file' => '%ssvnadmin.db' +]; diff --git a/02.php/config/svn.php b/02.php/config/svn.php index 8313bc9..c5f36f6 100644 --- a/02.php/config/svn.php +++ b/02.php/config/svn.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-04-24 23:37:06 * @LastEditors: witersen - * @LastEditTime: 2022-05-11 11:32:27 + * @LastEditTime: 2022-05-12 00:52:40 * @Description: QQ:1801168257 */ @@ -23,6 +23,8 @@ $temp_base_path = $home_path . 'temp/'; $templete_base_path = $home_path . 'templete/'; +$templete_init_struct = $templete_base_path . 'initStruct/'; + return [ /** * SVNAdmin软件配置信息的主目录 @@ -97,5 +99,10 @@ return [ /** * 初始化仓库结构模板目录 */ - 'templete_init_struct' => $templete_base_path . '01/', + 'templete_init_struct' => $templete_init_struct, + + /** + * 默认使用的仓库模板 + */ + 'templete_init_struct_01' => $templete_init_struct . '01/', ]; diff --git a/02.php/config/update.php b/02.php/config/update.php index a1d1b64..79e2902 100644 --- a/02.php/config/update.php +++ b/02.php/config/update.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-04-24 23:37:06 * @LastEditors: witersen - * @LastEditTime: 2022-05-09 11:41:24 + * @LastEditTime: 2022-05-11 19:58:31 * @Description: QQ:1801168257 */ @@ -12,17 +12,13 @@ */ return [ 'update_server' => [ - // [ - // 'nodeName' => 'gitee.com', - // 'url' => 'https://gitee.com/witersen/update/raw/master/SvnAdmin/update2.json' - // ], - // [ - // 'nodeName' => 'github.com', - // 'url' => 'https://gitee.com/witersen/update/raw/master/SvnAdmin/update2.json' - // ], [ - 'nodeName' => 'witersen.com', - 'url' => 'http://dev.witersen.com/server/update.json' + 'nodeName' => 'gitee.com', + 'url' => 'https://gitee.com/witersen/update/raw/master/SvnAdmin/update2.json' + ], + [ + 'nodeName' => 'github.com', + 'url' => 'https://gitee.com/witersen/update/raw/master/SvnAdmin/update2.json' ] ] ]; diff --git a/02.php/server/install.php b/02.php/server/install.php index fbca6dd..11979a6 100644 --- a/02.php/server/install.php +++ b/02.php/server/install.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-05-08 13:31:07 * @LastEditors: witersen - * @LastEditTime: 2022-05-11 13:46:48 + * @LastEditTime: 2022-05-12 00:11:29 * @Description: QQ:1801168257 */ @@ -64,6 +64,23 @@ class Install $this->config_version = Config::get('version'); } + /** + * 由于array_column到php5.5+才支持 + * 为了兼容php5.4 + * 这里选择手动实现 可能性能不高 + */ + function FunArrayColumn($array, $columnKey) + { + $resultArray = []; + foreach ($array as $key => $value) { + if (!array_key_exists($columnKey, $value)) { + return false; + } + array_push($resultArray, $value[$columnKey]); + } + return $resultArray; + } + /** * 检测SVNAdmin的新版本并选择更新 */ @@ -129,7 +146,7 @@ class Install //下载并执行升级脚本 $packages = $array['update']['download'][$key1]['packages']; - $forList = array_column($packages, 'for'); + $forList = $this->FunArrayColumn($packages, 'for'); $current = [ 'source' => $this->config_version['version'], 'dest' => $last @@ -194,6 +211,22 @@ class Install */ function ConfigSubversion() { + echo PHP_EOL . '===============================================' . PHP_EOL; + echo '确定要开始配置Subversion程序吗[y/n]：'; + $continue = strtolower(trim(fgets(STDIN))); + + if (!in_array($continue, ['y', 'n'])) { + echo '不正确的选项！' . PHP_EOL; + echo '===============================================' . PHP_EOL; + exit(); + } + + if ($continue == 'n') { + echo '已取消！' . PHP_EOL; + echo '===============================================' . PHP_EOL; + exit(); + } + /** * 1、检测Subversion的安装情况 */ @@ -219,6 +252,10 @@ class Install 'svnmucc' => '' ]; + echo '===============================================' . PHP_EOL; + echo '开始配置Subversion程序！' . PHP_EOL; + echo '===============================================' . PHP_EOL; + foreach ($needBin as $key => $value) { echo "请输入 $key 程序位置：" . PHP_EOL; echo '自动检测到以下程序路径：' . PHP_EOL; @@ -280,7 +317,7 @@ CON; //创建推荐钩子目录 is_dir($this->config_svn['recommend_hook_path']) ? '' : mkdir($this->config_svn['recommend_hook_path'], 0700, true); - shell_exec(sprintf("cp -r '%s' '%s'", $templete_path . '/hooks', $this->config_svn['recommend_hook_path'])); + shell_exec(sprintf("cp -r '%s' '%s'", $templete_path . '/hooks', $this->config_svn['home_path'])); //创建备份目录 is_dir($this->config_svn['backup_base_path']) ? '' : mkdir($this->config_svn['backup_base_path'], 0700, true); @@ -291,6 +328,13 @@ CON; //创建临时数据目录 is_dir($this->config_svn['temp_base_path']) ? '' : mkdir($this->config_svn['temp_base_path'], 0700, true); + //创建模板文件目录 + is_dir($this->config_svn['templete_base_path']) ? '' : mkdir($this->config_svn['templete_base_path'], 0700, true); + + //创建仓库结构模板目录 + // is_dir($this->config_svn['templete_init_struct']) ? '' : mkdir($this->config_svn['templete_init_struct'], 0700, true); + shell_exec(sprintf("cp -r '%s' '%s'", $templete_path . '/initStruct', $this->config_svn['templete_base_path'])); + echo '===============================================' . PHP_EOL; echo '创建相关文件' . PHP_EOL; @@ -321,17 +365,42 @@ CON; echo '===============================================' . PHP_EOL; /** - * 4、配置SQLite数据库文件 + * 4、关闭selinux + * 包括临时关闭和永久关闭 + */ + echo '临时关闭并永久关闭seliux' . PHP_EOL; + + //临时关闭selinux + shell_exec('setenforce 0'); + + //永久关闭selinux + shell_exec("sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config"); + + echo '===============================================' . PHP_EOL; + + /** + * 5、配置SQLite数据库文件 */ echo '配置并启用SQLite数据库' . PHP_EOL; + copy($templete_path . '/database/sqlite/svnadmin.db', $this->config_svn['home_path'] . 'svnadmin.db'); - echo '===============================================' . PHP_EOL; //配置SQLite数据库文件的父目录权限配置为777 解决无法写入且不报错的问题 shell_exec('chmod 777 ' . $this->config_svn['home_path']); + echo '===============================================' . PHP_EOL; + /** - * 5、将svnserve注册为系统服务 + * 6、主目录授权 + */ + echo '配置主目录权限' . PHP_EOL; + + shell_exec(sprintf("chmod 777 -R '%s'", $this->config_svn['home_path'])); + + echo '===============================================' . PHP_EOL; + + /** + * 7、将svnserve注册为系统服务 */ echo '清理之前注册的svnserve服务' . PHP_EOL; @@ -389,7 +458,7 @@ CON; echo '===============================================' . PHP_EOL; - if (!in_array($answer, array_column($this->scripts, 'index'))) { + if (!in_array($answer, $this->FunArrayColumn($this->scripts, 'index'))) { exit('错误的命令编号：' . PHP_EOL); } @@ -404,6 +473,14 @@ CON; $shell = scandir($shellPath); + echo '安装脚本来自 WANdiso' . PHP_EOL; + + echo '如果由于网络延迟原因安装失败，可手动停止后多尝试几次' . PHP_EOL; + + echo '在通过脚本安装Subversion的过程中，请注意信息交互！' . PHP_EOL; + + echo '===============================================' . PHP_EOL; + echo '可选择的Subversion版本如下：' . PHP_EOL; $noShell = true; diff --git a/02.php/server/svnadmind.php b/02.php/server/svnadmind.php index d74046e..6fe996c 100644 --- a/02.php/server/svnadmind.php +++ b/02.php/server/svnadmind.php @@ -3,7 +3,7 @@ * @Author: witersen * @Date: 2022-04-24 23:37:06 * @LastEditors: witersen - * @LastEditTime: 2022-05-11 01:54:56 + * @LastEditTime: 2022-05-12 00:17:45 * @Description: QQ:1801168257 */ @@ -130,6 +130,7 @@ class Daemon { //接收客户端发送的数据 $receive = socket_read($client, $this->config_daemon['SOCKET_READ_LENGTH']); + $receive = unserialize($receive); $type = $receive['type']; @@ -273,7 +274,10 @@ class Daemon } } $this->UpdateSign(); - echo '已在启动时自动更改系统的加密密钥，正在登录的用户会退出登录' . PHP_EOL; + echo '启动成功' . PHP_EOL; + echo '可进行网站访问' . PHP_EOL; + echo '检出SVN仓库前请注意放行协议端口（默认3690）' . PHP_EOL; + echo '已自动更改系统加密密钥，在线用户会退出登录' . PHP_EOL; $this->InitDeamon(); }