pindo 5.0.4 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e7508977271b8a9092068bffb6c429402f3f4f3ddf9d9c8fdd3e4c7b7580522
-  data.tar.gz: 912474cf184b1621c147f5c713f374e48f40deeff97306504fa5745fe3648cd2
+  metadata.gz: da7db67cae593054d94da87ec555ccd0d6ed2691ca9d534729a386b4cc55f360
+  data.tar.gz: 25b281165febd17ac56dfcadd64dcf2e55674e326b28575ff3952007b7dbdc2d
 SHA512:
-  metadata.gz: efc6aeff8688764f201c3723e8b8e391ab02c9abef5d7b9bee68d30a821903549b7343b62e02a02aa8c66918b048c3cc4652523380ab4e08e6a34d96ce8eca6a
-  data.tar.gz: 92671cf31234549e38c59c2a673ff8bc181ef580b0ae5698c69b3179384346d03d3b8966f4b932348c23fd6cbfd1e7af3516e5431da9bdc841969f274327ad7b
+  metadata.gz: '089d77424e3f53c88de5d9839b6849a11c868e6bf637b485403cec677a0e320cc2292e09fe8c868ecec3950a28e21b060a0867eadcd9b01dd1cab7aaaf8b878d'
+  data.tar.gz: 34a13c1bf0691285cd4d7c76c284c288c445ec2f3e67650d504ccdf1d3c2baa599c91492943ddee6078245372e5ae42746d2cd2bb881f9da0075305f7bd03d66

data/lib/pindo/base/githelper.rb

@@ -545,7 +545,7 @@ module Pindo
             end 
             
             git!(%W(-C #{project_dir} reset --hard))
-            git!(%W(-C #{project_dir} clean -dfx))
+            git!(%W(-C #{project_dir} clean -df))
             git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch})) 
             git!(%W(-C #{project_dir} pull))
         end

data/lib/pindo/client/pgyer_feishu_oauth_cli.rb

@@ -0,0 +1,313 @@
+#!/usr/bin/env ruby
+
+require 'webrick'
+require 'json'
+require 'net/http'
+require 'uri'
+require 'securerandom'
+require 'digest'
+require 'base64'
+require 'fileutils'
+require 'pindo/base/aeshelper'
+require 'pindo/config/pindouserlocalconfig'
+
+module Pindo
+ 
+  class PgyerFeishuOAuthCLI
+    attr_reader :access_token, :refresh_token, :user_info
+
+    def initialize(client_id)
+      @client_id = client_id
+      @feishu_auth_url = 'https://open.feishu.cn/open-apis/authen/v1/index'
+      @redirect_uri = 'https://jps-new.devtestapp.com/auth/jwt/login'
+      # @state = SecureRandom.hex(16)
+      @state = 'success_login'
+      @larkScopeList = [
+        'offline_access',
+        'task:task:write',
+        'task:section:write',
+        'task:custom_field:write',
+        'task:tasklist:write',
+      ];
+
+      @access_token = nil
+      @refresh_token = nil
+      @token_expired_at = nil
+
+      @pgyer_token_file = File.join(File::expand_path(Pindoconfig.instance.pindo_dir), ".pgyer_token")
+      
+      # 尝试读取配置文件中的AES密钥
+      begin
+        config_file = File.join(File::expand_path(Pindoconfig.instance.pindo_common_configdir), "pgyer_client_config.json")
+        if File.exist?(config_file)
+          config_json = JSON.parse(File.read(config_file))
+          @pgyer_aes_key = config_json["pgyerapps_aes_key"] if config_json["pgyerapps_aes_key"]
+        end
+      rescue => e
+        puts "读取配置文件失败: #{e.message}"
+      end
+      
+      # 如果配置文件中没有找到密钥，则使用默认密钥
+      @pgyer_aes_key ||= ENV['PGYER_AES_KEY'] || "pgyerOauthToken2024"
+
+      # Pgyer API endpoints
+      @pgyer_api_endpoint = 'https://jps-api.devtestapp.com/api/lark_login'
+    end
+
+    # 启动授权流程
+    def authorize
+      # 先检查是否有存储的令牌
+      if load_token
+        puts "找到已保存的Pgyer令牌，尝试验证..."
+        if validate_pgyer_token
+          puts "已有令牌验证成功！"
+          return true
+        else
+          puts "已有令牌已失效，需要重新授权。"
+        end
+      end
+
+      authorization_uri = build_authorization_uri
+      puts "正在打开浏览器进行飞书OAuth授权..."
+      puts "授权URI: #{authorization_uri}"
+      
+      # 在浏览器中打开授权URL
+      open_browser(authorization_uri)
+      
+      # 启动本地服务器处理回调
+      code = start_callback_server
+      
+      if code
+        puts "正在使用飞书身份登录Pgyer..."
+        if login_pgyer_with_feishu(code:code)
+          store_token
+          return true
+        end
+        return false
+      else
+        puts "授权失败"
+        return false
+      end
+    end
+
+    # 验证Pgyer令牌
+    def validate_pgyer_token
+      return false unless @access_token
+      
+      # 这里应该调用Pgyer的API验证令牌有效性
+      # 由于没有具体API文档，这里仅做示例
+      uri = URI("https://www.pgyer.com/api/user/profile")
+      request = Net::HTTP::Get.new(uri)
+      request['Authorization'] = "Bearer #{@access_token}"
+      
+      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+        http.request(request)
+      end
+      
+      return response.code == '200'
+    end
+
+    # 使用code登录Pgyer, 并且Pgyer返回token
+    def login_pgyer_with_feishu(code: nil)
+      return false unless code
+      
+      uri = URI(@pgyer_api_endpoint)
+      request = Net::HTTP::Post.new(uri)
+      request['Content-Type'] = 'application/json'
+      
+      # 根据Pgyer的API要求构造请求体
+      request.body = {
+        code: code,
+        redirectUri: @redirect_uri,
+        scope: @larkScopeList.join(' ')
+      }.to_json
+      
+      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+        http.request(request)
+      end
+      
+      if response.code == '200'
+        begin
+          result = JSON.parse(response.body)
+          if !result['meta'].nil? && result['meta']['code'] == 200 && !result['data'].nil? && !result['data']['token'].nil?
+            @access_token = result['data']['token']
+            @username = result['data']['token']
+            @user_id = result['data']['user_id']
+
+            return true
+          else
+            puts "Pgyer登录失败: #{result['message'] || '未知错误'}"
+            return false
+          end
+        rescue JSON::ParserError
+          puts "解析Pgyer响应失败"
+          return false
+        end
+      else
+        puts "Pgyer登录请求失败: HTTP #{response.code}"
+        return false
+      end
+
+    end
+
+
+    # 加载存储的令牌
+    def load_token
+      return false unless File.exist?(@pgyer_token_file)
+      
+      begin
+        encrypted_data = File.read(@pgyer_token_file)
+        json_data = aes_decrypt(encrypted_data, @pgyer_aes_key)
+        token_data = JSON.parse(json_data)
+        
+        @access_token = token_data['token']
+        @user_info = token_data['user_info'] if token_data['user_info']
+        @token_expired_at = Time.at(token_data['expires_at']) if token_data['expires_at']
+        
+        # 检查令牌是否过期
+        if @token_expired_at && Time.now >= @token_expired_at
+          puts "令牌已过期，需要重新授权"
+          return false
+        end
+        
+        return true
+      rescue => e
+        puts "加载令牌失败: #{e.message}"
+        return false
+      end
+    end
+
+    # 存储令牌
+    def store_token
+      return false unless @access_token
+      
+      token_data = {
+        'token' => @access_token,
+        'user_info' => @user_info,
+        'expires_at' => Time.now.to_i + 7*24*60*60  # 假设令牌有效期为7天
+      }
+      
+      encrypted_data = aes_encrypt(token_data.to_json, @pgyer_aes_key)
+      
+      begin
+        File.open(@pgyer_token_file, 'w') do |f|
+          f.write(encrypted_data)
+        end
+        puts "令牌已安全存储"
+        return true
+      rescue => e
+        puts "存储令牌失败: #{e.message}"
+        return false
+      end
+    end
+
+    private
+
+    # AES加密
+    def aes_encrypt(data, key)
+      # 使用Pindo的AESHelper类进行真正的AES加密
+      AESHelper::aes_128_ecb_encrypt(key, data)
+    end
+
+    # AES解密
+    def aes_decrypt(encrypted_data, key)
+      # 使用Pindo的AESHelper类进行真正的AES解密
+      AESHelper::aes_128_ecb_decrypt(key, encrypted_data)
+    end
+
+    # 构建授权URI
+    def build_authorization_uri
+      uri = URI(@feishu_auth_url)
+
+
+
+      params = {
+        'app_id' => @client_id,
+        'redirect_uri' => @redirect_uri,
+        'response_type' => 'code',
+        'state' => @state,
+        'scope' => @larkScopeList.join(' ')
+      }
+      
+      uri.query = URI.encode_www_form(params)
+      uri.to_s
+    end
+
+    # 在浏览器中打开URL
+    def open_browser(url)
+      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+        system("start", url)
+      elsif RbConfig::CONFIG['host_os'] =~ /darwin/
+        system("open", url)
+      elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
+        system("xdg-open", url)
+      else
+        puts "无法自动打开浏览器，请手动访问: #{url}"
+      end
+    end
+
+    # 启动本地服务器处理回调
+    def start_callback_server
+      code = nil
+      uri = URI(@redirect_uri)
+      server = WEBrick::HTTPServer.new(
+        Port: uri.port,
+        Logger: WEBrick::Log.new("/dev/null"),
+        AccessLog: []
+      )
+
+      path = uri.path.empty? ? '/' : uri.path
+      server.mount_proc path do |req, res|
+        query_params = URI.decode_www_form(req.query_string || '').to_h
+        
+        if query_params['state'] != @state
+          res.body = "状态不匹配，可能存在CSRF攻击风险"
+        elsif query_params['error']
+          res.body = "授权错误: #{query_params['error']}"
+        elsif query_params['code']
+          code = query_params['code']
+          res.body = <<-HTML
+          <!DOCTYPE html>
+          <html>
+          <head>
+            <title>飞书授权成功</title>
+            <style>
+              body { font-family: Arial, sans-serif; text-align: center; padding: 40px; }
+              .container { max-width: 600px; margin: 0 auto; }
+              .success { color: #4CAF50; }
+            </style>
+          </head>
+          <body>
+            <div class="container">
+              <h1 class="success">授权成功！</h1>
+              <p>飞书OAuth授权已完成，您现在可以关闭此窗口并返回命令行。</p>
+            </div>
+          </body>
+          </html>
+          HTML
+        else
+          res.body = "未获取到授权码"
+        end
+
+        server.shutdown
+      end
+
+      # 捕获Ctrl+C以允许用户中断
+      trap('INT') { server.shutdown }
+      
+      # 在线程中运行服务器，最多等待2分钟
+      thread = Thread.new { server.start }
+      begin
+        thread.join(120) # 最多等待2分钟
+      rescue Timeout::Error
+        puts "授权超时"
+        server.shutdown
+      end
+
+      code
+    end
+
+
+  end
+
+end