- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] doc/manual : rename
by Li Yuanchao 26 Nov '20

26 Nov '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- ...-compass-ci-to-test-open-source-project.md | 53 ------------------- ...00\346\272\220\351\241\271\347\233\256.md" | 0 2 files changed, 53 deletions(-) delete mode 100644 doc/manual/how-to-use-compass-ci-to-test-open-source-project.md rename doc/how-to-use-compass-ci-to-test-open-source-project.md => "doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" (100%) diff --git a/doc/manual/how-to-use-compass-ci-to-test-open-source-project.md b/doc/manual/how-to-use-compass-ci-to-test-open-source-project.md deleted file mode 100644 index ad4f9b0..0000000 --- a/doc/manual/how-to-use-compass-ci-to-test-open-source-project.md +++ /dev/null @@ -1,53 +0,0 @@ -使用compass-ci平台测试开源仓库，需要完成 -1. 将仓库url添加到upstream-repos仓库中 -2. 添加自己的测试case - -### 首先，将想要测试的代码仓信息以yaml格式文件的形式添加到upstream-repos仓库 - -仓库地址为：https://gitee.com/wu_fengguang/upstream-repos - -你可以先fork这个仓库，新建文件之后，通过Pull Request的方式完成添加。 - -以仓库backlight为例： - -它的url为：https://github.com/baskerville/backlight -1. 以首字母和仓库名创建路径 -``` -mkdir -p b/backlight -``` -2. 在该目录下新建同名文件backlight： -``` -cd b/backlight -touch backlight -``` -3. 使用vim写入url： -``` -vim backlight -``` -内容格式为 -``` ---- -url: -- https://github.com/baskerville/backlight -``` -请保持格式一致，若不确定，可参考upstream-repos仓库中已有文件。 - -### 然后，将测试case以yaml文件的形式添加到lkp-tests仓库的jobs目录 - -仓库地址为 https://gitee.com/wu_fengguang/lkp-tests - -这其中有一些已经适配好的测试case，如果你想要测试的case其中正好有，那就可以直接使用。使用方式以iperf为例。 - -iperf是已经适配的一个测试case，在lkp-tests仓库的jobs下有一个iperf.yaml文件，里面有一些测试的基本参数。 - -然后，你要在compass-ci仓库下面的 sbin/auto_submit.yaml 文件中添加 -``` -b/backlight/backlight: -- testbox=vm-2p8g os=openEuler os_version=20.03 os_mount=initramfs os_arch=aarch64 iperf.yaml -``` -并通过Pull Request的方式提交。相关参数含义见参考文档 - -参考文档： -- [compass-ci测试平台使用教程--submit命令详解](https://gitee.com/wu_fengguang/compass-ci/t… -- [如何适配测试用例](https://gitee.com/wu_fengguang/lkp-tests/blob/master/doc/add-test… - diff --git a/doc/how-to-use-compass-ci-to-test-open-source-project.md "b/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" similarity index 100% rename from doc/how-to-use-compass-ci-to-test-open-source-project.md rename to "doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" -- 2.23.0

1 0

[PATCH compass-ci] doc/manual: rename compass-ci测试平台使用教程--submit命令详解.md to submit命令详解.md
by Wu Zhende 26 Nov '20

26 Nov '20

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- .../submit\345\221\275\344\273\244\350\257\246\350\247\243.md" | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename "doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" => "doc/manual/submit\345\221\275\344\273\244\350\257\246\350\247\243.md" (100%) diff --git "a/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" "b/doc/manual/submit\345\221\275\344\273\244\350\257\246\350\247\243.md" similarity index 100% rename from "doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" rename to "doc/manual/submit\345\221\275\344\273\244\350\257\246\350\247\243.md" -- 2.23.0

1 0

[PATCH compass-ci] doc/manual: rename doc
by Wei Jihui 26 Nov '20

26 Nov '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- ...46\237\245\347\234\213\344\273\273\345\212\241\347\273\223.md" | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename "doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234" => "doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223.md" (100%) diff --git "a/doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234" "b/doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223.md" similarity index 100% rename from "doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234" rename to "doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223.md" -- 2.23.0

1 0

[PATCH v2 lkp-tests] jobs: add borrow-10d.yaml
by Zhang Yale 26 Nov '20

26 Nov '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/borrow-10d.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/jobs/borrow-10d.yaml b/jobs/borrow-10d.yaml index 3896ef78..aeb55466 100644 --- a/jobs/borrow-10d.yaml +++ b/jobs/borrow-10d.yaml @@ -1,6 +1,14 @@ suite: borrow testcase: borrow -runtime: 10d - -sleep: +sshd: + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> + my_email: +# sleep at the bottom +sleep: 10d -- 2.23.0

1 0

[PATCH lkp-tests] jobs: add borrow-10d.yaml
by Zhang Yale 26 Nov '20

26 Nov '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/borrow-10d.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/jobs/borrow-10d.yaml b/jobs/borrow-10d.yaml index 3896ef78..cd86284b 100644 --- a/jobs/borrow-10d.yaml +++ b/jobs/borrow-10d.yaml @@ -1,6 +1,13 @@ suite: borrow testcase: borrow -runtime: 10d - -sleep: +sshd: + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> + my_email: +sleep: 10d -- 2.23.0

1 1

[PATCH compass-ci] doc/manual: fix compass-ci测试平台使用教程--submit命令详解.md
by Wu Zhende 26 Nov '20

26 Nov '20

Some pictures can't show. Use texts replace. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- ...75\344\273\244\350\257\246\350\247\243.md" | 53 +++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git "a/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" "b/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" index df7487c..3b5440c 100644 --- "a/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" +++ "b/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" @@ -24,13 +24,60 @@ submit命令是我们提交测试任务最基本的方式，同时提供了很 ### -m的用法：使用-m参数可以启动任务监控功能，将会打印出任务执行过程中的各种状态信息方便用户实时监控所提交的任务执行到哪个阶段 -![../pictures/option-m.PNG](../pictures/option-m.PNG) +命令：submit -m iperf.yaml +效果如下： + submit iperf.yaml, got job_id=z9.170614 + query=>{"job_id":["z9.170614"]} + connect to ws://172.168.131.2:11310/filter + {"job_id":"z9.170614","message":"","job_state":"submit","result_root":"/srv/result/iperf/2020-11-26/vm-2p8g/openeuler-20.03-aarch6 + {"job_id": "z9.170614", "result_root": "/srv/result/iperf/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/tcp-30/z9.170614", "job_state + {"job_id": "z9.170614", "job_state": "boot"} + {"job_id": "z9.170614", "job_state": "download"} + {"time":"2020-11-26 15:54:48","mac":"0a-ab-e5-da-a2-64","ip":"172.18.210.198","job_id":"z9.170614","state":"running","testbox":"vm + {"job_state":"running","job_id":"z9.170614"} + {"job_state":"post_run","job_id":"z9.170614"} + {"start_time":"2020-11-26 07:53:45","end_time":"2020-11-26 07:54:15","loadavg":"1.17 0.36 0.13 1/109 1960","job_id":"z9.170614"} + {"job_state":"finished","job_id":"z9.170614"} + {"job_id": "z9.170614", "job_state": "complete"} + {"time":"2020-11-26 15:55:26","mac":"0a-ab-e5-da-a2-64","ip":"172.18.210.198","job_id":"z9.170614","state":"rebooting","testbox":"} + {"job_id": "z9.170614", "job_state": "extract_finished"} + connection closed: normal ### -c的用法： -c参数需要搭配-m参数来使用。使用场景：申请设备的任务实现自动登入功能命令：submit -m -c borrow-1h.yaml 当我们提交一个申请设备的任务后，会获取到返回的登陆信息，如：ssh ip -p port -添加-c参数之后不需要我们手动输入ssh登陆命令来进入执行机，效果如下图所示 -![../pictures/option-c.PNG](../pictures/option-c.PNG) +添加-c参数之后不需要我们手动输入ssh登陆命令来进入执行机，效果如下所示: + submit /home/wuzhende/code/lkp-tests/jobs/borrow-1h.yaml, got job_id=z9.143309 + query=>{"job_id":["z9.143309"]} + connect to ws://localhost:11310/filter + {"job_id":"z9.143309","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch + {"job_id": "z9.143309", "result_root": "/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.143309", "job_state" + {"job_id": "z9.143309", "job_state": "boot"} + {"job_id": "z9.143309", "job_state": "download"} + {"time":"2020-11-26 18:42:38","mac":"0a-f7-47-0e-19-12","ip":"172.18.16.158","job_id":"z9.143309","state":"running","testbox":"vm- + {"job_state":"running","job_id":"z9.143309"} + {"job_id": "z9.143309", "state": "set ssh port", "ssh_port": "51170", "tbox_name": "vm-2p8g.wuzhende-2252124"} + Host 172.168.131.113 not found in /home/wuzhende/.ssh/known_hosts + Warning: Permanently added '[172.168.131.113]:51170' (ECDSA) to the list of known hosts. + Last login: Wed Sep 23 11:10:58 2020 + + + Welcome to 4.19.90-2003.4.0.0036.oe1.aarch64 + + System information as of time: Thu Nov 26 18:42:40 CST 2020 + + System load: 1.53 + Processes: 105 + Memory used: 6.1% + Swap used: 0.0% + Usage On: 89% + IP address: 172.17.0.1 + Users online: 1 + + + + root@vm-2p8g ~# +已经成功登陆执行机 ### 总结以上即为submit各种参数的用法解释，您可以根据您的实际需求灵活搭配。 -- 2.23.0

1 0

[PATCH v3 compass-ci 4/4] assign-account: attach new direcroty for the container
by Luan Shengde 26 Nov '20

26 Nov '20

[why] enable execute command: usermod -s shell to enable/disable login permission Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/assign-account/start | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/container/assign-account/start b/container/assign-account/start index 2290982..793191a 100755 --- a/container/assign-account/start +++ b/container/assign-account/start @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -. $CCI_SRC/container/defconfig.sh +. ../defconfig.sh docker_rm assign-account @@ -11,8 +11,7 @@ cmd=( --restart=always --name=assign-account -d - -v /etc/passwd:/etc/passwd:ro - -v /etc/group:/etc/group:ro + -v /etc:/etc:rw -v /srv/account-info:/opt/account_data/:rw -v /home:/home:rw -p 29999:29999 @@ -20,14 +19,3 @@ cmd=( ) "${cmd[@]}" - -cat << EOF -port: 29999 ---- -Client: -./assign-tool.rb email_file - -email subject: "apply ssh account" - -Refer to compass-ci/doc/apply-ssh-account.md for more information. -EOF -- 2.23.0

1 0

[PATCH v3 compass-ci 3/4] assign-account: build email message for updating configuration
by Luan Shengde 26 Nov '20

26 Nov '20

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- .../assign-account/build-update-email.rb | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100755 container/assign-account/build-update-email.rb diff --git a/container/assign-account/build-update-email.rb b/container/assign-account/build-update-email.rb new file mode 100755 index 0000000..40d6b3b --- /dev/null +++ b/container/assign-account/build-update-email.rb @@ -0,0 +1,43 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +def build_update_message(email, account_info, conf_info) + message = if conf_info['enable_login'] + + <<~EMAIL_MESSAGE + To: #{email} + Subject: [compass-ci] account update notice + + Dear user: + + Your account has been update successfully. + You can use the following command to login the server. + + Login command: + ssh -p #{account_info['jumper_port']} #{account_info['my_login_name']}@#{account_info['jumper_host']} + + Account password: + #{account_info['my_password']} + + regards + compass-ci + EMAIL_MESSAGE + else + <<~EMAIL_MESSAGE + To: #{email} + Subject: [compass-ci] account expiration notice + + Dear user: + + your account has expired. + consult the manager for help if you want to continue using the account. + + regards + compass-ci + EMAIL_MESSAGE + end + + return message +end -- 2.23.0

1 0

[PATCH v3 compass-ci 2/4] assign-account: add new function and optimize
by Luan Shengde 26 Nov '20

26 Nov '20

[why] meet new options for answerback-email meet update configuration function for answerback-email [how] add new function for the new options for answerback-email optimize current function to enable update Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/assign-account/get_account_info.rb | 117 +++++++++++++++---- 1 file changed, 92 insertions(+), 25 deletions(-) diff --git a/container/assign-account/get_account_info.rb b/container/assign-account/get_account_info.rb index 0e91057..95bec14 100755 --- a/container/assign-account/get_account_info.rb +++ b/container/assign-account/get_account_info.rb @@ -29,11 +29,14 @@ API: call graph: setup_jumper_account_info - read_account_info - build_account_name + read account + read_account_info + build_account_info + reread_account_info read_jumper_info config_default_yaml config_authorized_key + permit_login_config generate_ssh_key the returned data for setup_jumper_account_info like: @@ -41,12 +44,14 @@ the returned data for setup_jumper_account_info like: "my_login_name" => "login_name", "password" => "password", "jumper_host" => "0.0.0.0", - "jumper_port" => "10000" + "jumper_port" => "10000", + "my_jumper_pubkey" => my_jumper_pubkey } =end require 'fileutils' +require 'yaml' # get jumper and account info class AccountStorage @@ -95,14 +100,21 @@ class AccountStorage end def setup_jumper_account_info - login_name, password = read_account_info + if @data.key?('is_update_account') && @data['is_update_account'] + login_name = @data['my_login_name'] + password = reread_account_info + else + login_name, password = read_account_info + end + jumper_host, jumper_port = read_jumper_info - pub_key = @data['my_ssh_pubkey'][0] - ssh_dir = File.join('/home/', login_name, '.ssh') - config_authorized_key(login_name, pub_key, ssh_dir) unless pub_key.nil? + config_authorized_key(login_name) config_default_yaml(login_name) - my_jumper_pubkey = generate_ssh_key(login_name, ssh_dir) if @data['gen_sshkey'].eql? true + permit_login_config(login_name) + if @data.key?('gen_sshkey') && @data['gen_sshkey'] + my_jumper_pubkey = generate_ssh_key(login_name) + end jumper_account_info = { 'my_login_name' => login_name, @@ -115,34 +127,89 @@ class AccountStorage return jumper_account_info end - def generate_ssh_key(login_name, ssh_dir) + def permit_login_config(login_name) + if @data.key?('enable_login') && @data['enable_login'] + %x(usermod -s /usr/bin/zsh #{login_name}) + else + %x(usermod -s /sbin/nologin #{login_name}) + end + end + + def generate_ssh_key(login_name) + ssh_dir = File.join('/home/', login_name, '.ssh') Dir.mkdir ssh_dir, 0o700 unless File.exist? ssh_dir + pub_key_file = File.join(ssh_dir, 'id_rsa.pub') + + return if File.exist?(pub_key_file) && \ + @data['my_ssh_pubkey'].include?(File.read(pub_key_file).strip) + %x(ssh-keygen -f "#{ssh_dir}/id_rsa" -N '' -C "#{login_name}@account-vm") - %x(chown -R #{login_name}:#{login_name} #{ssh_dir}) - File.read("/home/#{login_name}/.ssh/id_rsa.pub") + + FileUtils.chown_R(login_name, login_name, ssh_dir) + File.read("/home/#{login_name}/.ssh/id_rsa.pub").strip end - def config_default_yaml(login_name) + def touch_default_yaml(login_name) default_yaml_dir = File.join('/home', login_name, '.config/compass-ci/defaults') - FileUtils.mkdir_p default_yaml_dir + FileUtils.mkdir_p default_yaml_dir unless File.exist? default_yaml_dir + + default_yaml = File.join(default_yaml_dir, 'account.yaml') + FileUtils.touch default_yaml unless File.exist? default_yaml + default_yaml + end + def config_default_yaml(login_name) + default_yaml = touch_default_yaml(login_name) + + account_yaml = YAML.load_file(default_yaml) || {} # my_email, my_name, my_uuid is required to config default yaml file # they are added along with 'my_ssh_pubkey' when sending assign account request - File.open("#{default_yaml_dir}/account.yaml", 'a') do |file| - file.puts "my_email: #{@data['my_email']}" - file.puts "my_name: #{@data['my_name']}" - file.puts "my_uuid: #{@data['my_uuid']}" - end - %x(chown -R #{login_name}:#{login_name} "/home/#{login_name}/.config") + account_yaml['my_email'] = @data['my_email'] + account_yaml['my_name'] = @data['my_name'] + account_yaml['my_uuid'] = @data['my_uuid'] + + f = File.new(default_yaml, 'w') + f.puts account_yaml.to_yaml + f.close + FileUtils.chown_R(login_name, login_name, "/home/#{login_name}/.config") + end + + def config_authorized_key(login_name) + pub_key = @data['my_ssh_pubkey'][0] + + return if pub_key.nil? + return if pub_key.strip.end_with?('account-vm') + + ssh_dir = File.join('/home/', login_name, '.ssh') + Dir.mkdir ssh_dir, 0o700 unless File.exist? ssh_dir + + authorized_file = File.join(ssh_dir, 'authorized_keys') + FileUtils.touch authorized_file unless File.exist? authorized_file + + store_pubkey(ssh_dir, login_name, authorized_file, pub_key) end - def config_authorized_key(login_name, pub_key, ssh_dir) - Dir.mkdir ssh_dir, 0o700 - Dir.chdir ssh_dir - f = File.new('authorized_keys', 'w') + def store_pubkey(ssh_dir, login_name, authorized_file, pub_key) + authorized_keys = File.read(authorized_file).split("\n") + + return if authorized_keys.include?(pub_key.strip) + + f = File.new(authorized_file, 'a') f.puts pub_key f.close - File.chmod 0o600, 'authorized_keys' - %x(chown -R #{login_name}:#{login_name} #{ssh_dir}) + + FileUtils.chown_R(login_name, login_name, ssh_dir) + File.chmod 0o600, authorized_file + end + + def reread_account_info + my_login_name_file = File.join(@account_dir, 'assigned-users', @data['my_login_name']) + + message = "No such assigned account exists: #{my_login_name_file}." + raise message unless File.exist? my_login_name_file + + password = File.readlines(my_login_name_file)[0].chomp + + return password end end -- 2.23.0

1 0

[PATCH v3 compass-ci 1/4] answerback-email: add new options
by Luan Shengde 26 Nov '20

26 Nov '20

add option for answerback-email tool -n|--name name specify my_name for user when assigning account -l|--login value enable/disable user login allowed values: y|n -u|--update enable update configuration for assigned account -u option enable update for: my_name my_ssh_pubkey generate sshkey on jumper reset user's login permission Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/assign-account/answerback-email.rb | 153 +++++++++++++++---- 1 file changed, 123 insertions(+), 30 deletions(-) diff --git a/container/assign-account/answerback-email.rb b/container/assign-account/answerback-email.rb index 5ddc451..c6bfdd3 100755 --- a/container/assign-account/answerback-email.rb +++ b/container/assign-account/answerback-email.rb @@ -14,6 +14,7 @@ require 'optparse' require_relative '../defconfig' require_relative '../../lib/es_client' require_relative 'build-send-account-email' +require_relative 'build-update-email' names = Set.new %w[ JUMPER_HOST @@ -24,7 +25,7 @@ names = Set.new %w[ defaults = relevant_defaults(names) -JUMPER_HOST = defaults['JUMPER_HOST'] || 'api.compass-ci.openeuler.org' +JUMPER_HOST = defaults['JUMPER_HOST'] JUMPER_PORT = defaults['JUMPER_PORT'] || 29999 SEND_MAIL_HOST = defaults['SEND_MAIL_HOST'] || 'localhost' SEND_MAIL_PORT = defaults['SEND_MAIL_PORT'] || 49000 @@ -33,25 +34,61 @@ my_info = { 'my_email' => nil, 'my_name' => nil, 'my_commit_url' => nil, - 'my_uuid' => %x(uuidgen).chomp, - 'my_ssh_pubkey' => [], - 'gen_sshkey' => false + 'my_uuid' => nil, + 'my_login_name' => nil, + 'my_ssh_pubkey' => [] } -def init_info(mail_content, my_info) +# stdin_info is used to store infos added with option: +# -e email_address +# -n name +# -s pubkey_file +# email_info is used to store infos parsed from email_file with option: +# -f email_file +# my_info_es is used to store info read from ES when update user +# when use --update option +# stdin_info, email_info, my_info_es have different priority +# stdin_info > email_info > my_info_es +# when assigning account or update conf for account +# if they have the same key, my_info will use the value with higher priority. +# conf_info is used to store keys used to config the account +stdin_info = {} +email_info = {} +my_info_es = {} +conf_info = { + 'gen_sshkey' => false, + 'enable_login' => true, + 'is_update_account' => false +} + +def init_info(mail_content, email_info, my_info) my_info['my_email'] = mail_content.from[0] - my_info['my_name'] = mail_content.From.unparsed_value.gsub(/ <[^<>]*>/, '') + email_info['my_name'] = mail_content.From.unparsed_value.gsub(/ <[^<>]*>/, '') return if mail_content.attachments.empty? - my_info['my_ssh_pubkey'] << mail_content.attachments[0].body.decoded + email_info['new_email_pubkey'] = mail_content.attachments[0].body.decoded.strip +end + +def read_my_login_name(my_email, my_info_es) + my_account_info_str = %x(curl -XGET localhost:9200/accounts/_doc/#{my_email}) + my_account_info = YAML.safe_load my_account_info_str + message = "No such email found from the ES: #{my_email}" + raise message unless my_account_info['found'] + + my_info_es.update my_account_info['_source'] end options = OptionParser.new do |opts| - opts.banner = 'Usage: answerback-mail.rb [-e|--email email] ' - opts.banner += "[-s|--ssh-pubkey pub_key_file] [-f|--raw-email email_file] [-g|--gen-sshkey]\n" - opts.banner += " -e or -f is required\n" + opts.banner = 'Usage: answerback-mail.rb [-e|--email email] [-n|--name name] ' + opts.banner += "[-s|--ssh-pubkey pub_key_file] [-g|--gen-sshkey] [--login y|n] [--update]\n" + opts.banner += ' answerback-mail.rb [-f|--raw-email email_file] ' + opts.banner += "[-g|--gen-sshkey] [--login y|n] [--update]\n" + opts.banner += " -e|-f is required when applying account or updating account\n" + opts.banner += " -n is required when assigning account with -e\n" opts.banner += " -s is optional when use -e\n" - opts.banner += ' -g is optional, used to generate sshkey for user' + opts.banner += " -g is optional, used to generate sshkey for user\n" + opts.banner += " -u is required when updating an account\n" + opts.banner += ' -l is optional, used to enable/disable login permission' opts.separator '' opts.separator 'options:' @@ -60,18 +97,37 @@ options = OptionParser.new do |opts| my_info['my_email'] = email_address end + opts.on('-n name', '--name name', 'appoint name') do |name| + stdin_info['my_name'] = name + end + opts.on('-s pub_key_file', '--ssh-pubkey pub_key_file', \ 'ssh pub_key file, enable password-less login') do |pub_key_file| - my_info['my_ssh_pubkey'] << File.read(pub_key_file).chomp + stdin_info['new_ssh_pubkey'] = File.read(pub_key_file).strip end opts.on('-f email_file', '--raw-email email_file', 'email file') do |email_file| mail_content = Mail.read(email_file) - init_info(mail_content, my_info) + init_info(mail_content, email_info, my_info) end - opts.on('-g', '--gen-sshkey', 'generate jumper ras public/private key and return pubkey') do - my_info['gen_sshkey'] = true + opts.on('-g', '--gen-sshkey', 'generate jumper rsa public/private key and return pubkey') do + conf_info['gen_sshkey'] = true + end + + opts.on('-u', '--update', 'updata configurations') do + read_my_login_name(my_info['my_email'], my_info_es) + conf_info['is_update_account'] = true + end + + opts.on('-l value', '--login value', 'enable/disable login, value: y|n') do |value| + if value.downcase == 'y' + conf_info['enable_login'] = true + elsif value.downcase == 'n' + conf_info['enable_login'] = false + else + raise 'invalid parameter, please use y|n' + end end opts.on_tail('-h', '--help', 'show this message') do @@ -82,33 +138,70 @@ end options.parse!(ARGV) -def apply_account(my_info) - account_info_str = %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account' -d '#{my_info.to_json}') +def apply_account(my_info, conf_info) + apply_info = {} + apply_info.update my_info + apply_info.update conf_info + + account_info_str = %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account' -d '#{apply_info.to_json}') JSON.parse account_info_str end -def send_account(my_info) +def check_my_email(my_info) message = "No email address specified\n" - message += "use -e to add a email address\n" - message += 'or use -f to add a email file' - raise message if my_info['my_email'].nil? + message += "use -e to add an email address for applying account\n" + message += 'or use -f to add an email file' - account_info = apply_account(my_info) - my_info['my_login_name'] = account_info['my_login_name'] + raise message if my_info['my_email'].empty? +end +def build_my_info_from_input(my_info, email_info, my_info_es, stdin_info) + new_email_pubkey = email_info.delete 'new_email_pubkey' + new_stdin_pubkey = stdin_info.delete 'new_ssh_pubkey' + new_pubkey = new_stdin_pubkey || new_email_pubkey + + my_info.update my_info_es unless my_info_es.empty? + my_info.update email_info unless email_info.empty? + my_info.update stdin_info unless stdin_info.empty? + + return if new_pubkey.nil? + return if my_info['my_ssh_pubkey'].include? new_pubkey + + my_info['my_ssh_pubkey'].insert(0, new_pubkey) +end + +def build_my_info_from_account_info(my_info, account_info, conf_info) unless account_info['my_jumper_pubkey'].nil? - my_info['my_ssh_pubkey'] << account_info['my_jumper_pubkey'].chomp + return if my_info['my_ssh_pubkey'][-1] == account_info['my_jumper_pubkey'] + + my_info['my_ssh_pubkey'] << account_info['my_jumper_pubkey'] end - my_info.delete 'gen_sshkey' + my_info['my_login_name'] = account_info['my_login_name'] unless conf_info['is_update_account'] +end + +def send_account(my_info, conf_info, email_info, my_info_es, stdin_info) + check_my_email(my_info) + my_info['my_uuid'] = %x(uuidgen).chomp unless conf_info['is_update_account'] + build_my_info_from_input(my_info, email_info, my_info_es, stdin_info) + + message = 'No my_name found, please use -n to add one' + raise message if my_info['my_name'].nil? + + account_info = apply_account(my_info, conf_info) + build_my_info_from_account_info(my_info, account_info, conf_info) + store_account_info(my_info) - send_mail(my_info, account_info) + send_mail(my_info, account_info, conf_info) end -def send_mail(my_info, account_info) - message = build_message(my_info['my_email'], account_info) - +def send_mail(my_info, account_info, conf_info) + message = if conf_info['is_update_account'] + build_update_message(my_info['my_email'], account_info, conf_info) + else + build_message(my_info['my_email'], account_info) + end %x(curl -XPOST '#{SEND_MAIL_HOST}:#{SEND_MAIL_PORT}/send_mail_text' -d "#{message}") end @@ -117,4 +210,4 @@ def store_account_info(my_info) es.put_source_by_id(my_info['my_email'], my_info) end -send_account(my_info) +send_account(my_info, conf_info, email_info, my_info_es, stdin_info) -- 2.23.0

1 0