lg_pod_plugin 1.1.6.5 → 1.1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7af2ac8a760f94c57f82d9005cd1b366a7dc9b51ab09c887e43dff3e0f43b0c4
-  data.tar.gz: f120886f336ce31ea35dcc38300a24561878a7a49963017484d26b59eb3e671e
+  metadata.gz: ad00d26eddca0197af9e74cce63dde7b58620b66694e5c97efeb6c8ca00c451d
+  data.tar.gz: 6f67d7bf931020022b87d2bb2de40b74d25716e6a4ef5b1dad0f70b0a7a03e67
 SHA512:
-  metadata.gz: e304fe0bbafee6d7ad797c3bc32e60c4fb050109d29a2d04d27d0a22630a7e9abf024820e54891792c16b8953f0574b0876e4df2b67cf27f22e57af7c89a6352
-  data.tar.gz: 13029c1d8e46a6dc0388fc7de8e78b470dbd6f040834d6554bab1c615a4344d7f8584efbf56714c1429262fb6478ec2fa6792cfedef7570b0ad3cd4b354ddfb4
+  metadata.gz: efa9785b96cd87f2d8af38fa907b6df5f036a7d4c6f3caa8c4cf338d07233271d27c78d1a0177fddda2117a760cefd3adb6f9c111045634e35d733131e774198
+  data.tar.gz: ee86b67391bafbfc0db8b4b9063935b3f736f38487f181e2a729402d6cc1368806ace7f8acb21850b229a0436307e6e099dde50448e305ffa9d3a3acafe2875d

data/lib/command/init.rb

@@ -1,4 +1,5 @@
 require 'claide'
+require 'json'
 require_relative 'command'
 
 module LgPodPlugin
@@ -7,8 +8,7 @@ module LgPodPlugin
       self.command = "init"
       self.abstract_command = false
       self.summary = '初始化gitlab projects 信息'
-      attr_accessor :username
-      attr_accessor :password
+      attr_accessor :token
       attr_accessor :host
       self.description = <<-DESC
         Manipulate the download cache for pods, like printing the cache content
@@ -17,16 +17,44 @@ module LgPodPlugin
 
       def initialize(argv)
         self.host = argv.option('host')
-        self.username = argv.option('username')
-        self.password = argv.option('password')
+        self.token = argv.option('token')
         super
       end
 
       def run
-        raise unless self.host
-        raise unless self.username
-        raise unless self.password
-        GitLabAPI.request_gitlab_access_token(self.host, self.username, self.password)
+        if self.host.nil? || self.host == ""
+          LgPodPlugin.log_red  "传入host不能为空"
+          return
+        end
+        if self.token.nil? || self.token == ""
+          LgPodPlugin.log_red "传入token不能为空"
+          return
+        end
+        token_vaild = GitLabAPI.request_user_emails(self.host, self.token)
+        if token_vaild == "invalid token"
+          LgPodPlugin.log_red "无效的access_token, 请检查私人令牌是否在有限期内"
+          return
+        end
+        refresh_token = ""
+        expires_in = 7879680
+        created_at = Time.now.to_i
+        encrypt_access_token = LUtils.encrypt(self.token, "AZMpxzVxzbo3sFDLRZMpxzVxzbo3sFDZ")
+        hash = {"access_token": encrypt_access_token}
+        hash["token_type"] = "Bearer"
+        hash["expires_in"] = expires_in
+        hash["scope"] = "api"
+        hash["created_at"] = created_at
+        hash["refresh_token"] = refresh_token
+        db_path = LFileManager.download_director.join("database")
+        db_path.mkdir unless db_path.exist?
+        token_file = db_path.join("access_token.json")
+        str = JSON.generate(hash)
+        File.open(token_file.to_path, 'w+') { |f| f.write(str) }
+        LSqliteDb.shared.init_database
+        user_id = LUserAuthInfo.get_user_id(self.host)
+        user_model = LUserAuthInfo.new(user_id, "", "", self.host, self.token, "", (created_at + expires_in))
+        LSqliteDb.shared.insert_user_info(user_model)
+        LgPodPlugin.log_green "设置私人访问令牌成功"
       end
 
     end

data/lib/lg_pod_plugin/config/l_config.rb

@@ -23,23 +23,11 @@ module LgPodPlugin
       user_info = LSqliteDb.shared.query_user_info(user_id)
       # 用户授权 token 不存在, 提示用户输入用户名密码
       unless user_info
-        user_info = GitLabAPI.get_gitlab_access_token_input(uri, user_id,nil ,nil )
+        user_info = GitLabAPI.get_gitlab_access_token(uri, user_id)
         return nil unless user_info
       end
-      time_now = Time.now.to_i
-      # 判断 token 是否失效
-      if user_info.expires_in <= time_now
-        # 刷新 token 失败时, 通过已经保存的用户名密码来刷新 token
-        new_user_info = GitLabAPI.refresh_gitlab_access_token uri.hostname, user_info.refresh_token
-        if new_user_info.nil?
-          username = user_info.username
-          password = user_info.password
-          user_info = GitLabAPI.get_gitlab_access_token_input(uri, user_id, username, password)
-          return nil unless user_info
-        else
-          user_info = new_user_info
-        end
-      end
+      user_info = GitLabAPI.check_gitlab_access_token_valid(uri, user_info)
+      return nil unless user_info
       config = LConfig.new
       config.host = uri.hostname
       config.access_token = user_info.access_token

data/lib/lg_pod_plugin/db/database.rb

@@ -42,8 +42,8 @@ module LgPodPlugin
       self.commit = commit
     end
 
-    def self.get_pod_id(name, git)
-      key = name + git
+    def self.get_pod_id(name, git, branch)
+      key = name + git + branch
       return Digest::MD5.hexdigest(key)
     end
 
@@ -221,7 +221,7 @@ module LgPodPlugin
     end
 
     def insert_pod_refs(name, git, branch, tag, commit)
-      id = LPodLatestRefs.get_pod_id(name, git)
+      id = LPodLatestRefs.get_pod_id(name, git, branch)
       pod = LPodLatestRefs.new(id, name, git, branch, tag, commit)
       if self.query_pod_refs(id) != nil
         self.db.execute_batch(

data/lib/lg_pod_plugin/downloader/request.rb

@@ -125,7 +125,7 @@ module LgPodPlugin
       if branch
         new_commit, _ = GitLabAPI.request_github_refs_heads git, branch, self.net_ping.uri
         unless new_commit
-          id = LPodLatestRefs.get_pod_id(name, git)
+          id = LPodLatestRefs.get_pod_id(name, git, branch)
           pod_info = LSqliteDb.shared.query_pod_refs(id)
           new_commit = pod_info ? pod_info.commit : nil
           return [branch, new_commit]
@@ -137,14 +137,14 @@ module LgPodPlugin
       else
         new_commit, new_branch = GitLabAPI.request_github_refs_heads git, nil, self.net_ping.uri
         unless new_commit
-          id = LPodLatestRefs.get_pod_id(name, git)
+          id = LPodLatestRefs.get_pod_id(name, git, "HEAD")
           pod_info = LSqliteDb.shared.query_pod_refs(id)
           new_commit = pod_info ? pod_info.commit : nil
           new_branch = pod_info ? pod_info.branch : nil
           return [new_branch, new_commit]
         end
         if new_commit
-          LSqliteDb.shared.insert_pod_refs(name, git, new_branch, nil, new_commit)
+          LSqliteDb.shared.insert_pod_refs(name, git, "HEAD", nil, new_commit)
         end
         [new_branch, new_commit]
       end

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -7,6 +7,33 @@ module LgPodPlugin
 
   class GitLabAPI
 
+    # 通过读取本地文件获取 access_token
+    def self.get_gitlab_access_token(uri, user_id)
+      text = LUtils.encrypt("AzfAjh-xTzyRBXmYuGBr", "AZMpxzVxzbo3sFDLRZMpxzVxzbo3sFDZ")
+      db_path = LFileManager.download_director.join("database")
+      db_path.mkdir unless db_path.exist?
+      token_file = db_path.join("access_token.json")
+      return self.get_gitlab_access_token_input(uri, user_id, nil, nil) unless token_file.exist?
+      json = JSON.parse(File.read("#{token_file.to_path}"))
+      encrypt_access_token = json["access_token"]
+      return self.get_gitlab_access_token_input(uri, user_id, nil, nil) if encrypt_access_token.nil?
+      access_token = LUtils.decrypt(encrypt_access_token, "AZMpxzVxzbo3sFDLRZMpxzVxzbo3sFDZ")
+      token_vaild = GitLabAPI.request_user_emails(uri.hostname, access_token)
+      if token_vaild == "invalid token"
+        FileUtils.rm_rf token_file
+        return self.get_gitlab_access_token_input(uri, user_id, nil, nil) if encrypt_access_token.nil?
+      end
+      user_id = LUserAuthInfo.get_user_id(uri.hostname)
+      refresh_token = json["refresh_token"]
+      expires_in = json["expires_in"] ||= 7879680
+      created_at = json["created_at"] ||= Time.now.to_i
+      user_model = LUserAuthInfo.new(user_id, "", "", uri.hostname, access_token, refresh_token, (created_at + expires_in))
+      LSqliteDb.shared.insert_user_info(user_model)
+      LgPodPlugin.log_green "请求成功: `access_token` => #{access_token}, expires_in => #{expires_in}"
+      return user_model
+    end
+
+    # 通过输入用户名和密码 获取 access_token
     def self.get_gitlab_access_token_input(uri, user_id, username = nil, password = nil)
       unless username && password
         LgPodPlugin.log_yellow "请输入 `#{uri.to_s}` 的用户名"
@@ -18,6 +45,40 @@ module LgPodPlugin
       user_info = LSqliteDb.shared.query_user_info(user_id)
       return user_info
     end
+    # 检查 token 是否在有效期内
+    def self.check_gitlab_access_token_valid(uri, user_info)
+      time_now = Time.now.to_i
+      # 判断 token 是否失效
+      if user_info.expires_in <= time_now
+        refresh_token = user_info.refresh_token
+        if refresh_token.nil? || refresh_token == "" # 使用本地令牌访问
+          project_name = LUtils.get_git_project_name(uri.to_s)
+          token_vaild = GitLabAPI.request_user_emails(uri.hostname, user_info.access_token)
+          if token_vaild == "success"
+            new_user_info = LUserAuthInfo.new(user_info.id, "", "", uri.hostname, user_info.access_token, nil, (time_now + 7879680))
+            LSqliteDb.shared.insert_user_info(user_info)
+            return new_user_info
+          else
+            token_file = LFileManager.download_director.join("database").join("access_token.json")
+            FileUtils.rm_rf token_file if token_file.exist?
+            return self.get_gitlab_access_token_input(uri, user_info.id, nil, nil)
+          end
+        else
+          # 刷新 token 失败时, 通过已经保存的用户名密码来刷新 token
+          new_user_info = GitLabAPI.refresh_gitlab_access_token uri.hostname, refresh_token
+          if new_user_info.nil?
+            username = user_info.username
+            password = user_info.password
+            user_info = GitLabAPI.get_gitlab_access_token_input(uri, user_info.user_id, username, password)
+            return nil unless user_info
+          else
+            user_info = new_user_info
+          end
+        end
+      else
+        return user_info
+      end
+    end
 
     public
     # 获取 GitLab access_token
@@ -228,6 +289,31 @@ module LgPodPlugin
       end
     end
 
+    # 通过名称搜索项目信息
+    public
+    def self.request_user_emails(host, access_token)
+      begin
+        hash_map = {"access_token": access_token}
+        uri = URI("#{host}/api/v4/user/emails")
+        uri.query = URI.encode_www_form(hash_map)
+        res = Net::HTTP.get_response(uri)
+        if res.body
+          array = JSON.parse(res.body)
+        else
+          array = []
+        end
+        if array.is_a?(Array)
+          return "success"
+        elsif array.is_a?(Hash)
+          return "invalid token"
+        else
+          return "invalid token"
+        end
+      rescue
+        return "invalid token"
+      end
+    end
+
   end
 
 end

data/lib/lg_pod_plugin/net/l_uri.rb

@@ -30,13 +30,6 @@ module LgPodPlugin
       end
       return if origin_uri.nil?
       @uri = origin_uri
-      # redirect_url = LProject.shared.redirect_url_hash[origin_uri.host]
-      # if redirect_url
-      #   @uri = redirect_url
-      # else
-      #   @uri = URI(get_redirect_url(origin_uri.scheme + "://" + origin_uri.host))
-      #   LProject.shared.redirect_url_hash[origin_uri.host] = @uri
-      # end
       @host = @uri.host
       @scheme = @uri.scheme ||= "https"
       @hostname =  @scheme + "://" + @host

data/lib/lg_pod_plugin/utils/l_util.rb

@@ -3,20 +3,20 @@ require 'resolv'
 require "ipaddr"
 require 'base64'
 require 'fileutils'
-# require_relative 'aes-crypt'
+require_relative 'aes-crypt'
 
 module LgPodPlugin
 
   class LUtils
 
-    # def self.encrypt(message, password)
-    #   encrypted_data = AESCrypt.encrypt(message, password)
-    #   encrypted_data.tr("\n", "")
-    # end
-    #
-    # def self.decrypt(message, password)
-    #   AESCrypt.decrypt message, password
-    # end
+    def self.encrypt(message, password)
+      encrypted_data = AESCrypt.encrypt(message, password)
+      encrypted_data.tr("\n", "")
+    end
+
+    def self.decrypt(message, password)
+      AESCrypt.decrypt message, password
+    end
 
     def self.md5(text)
       return "" unless text

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.6.5"
+  VERSION = "1.1.6.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.6.5
+  version: 1.1.6.7
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -160,6 +160,7 @@ files:
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/2.7/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.0/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.1/sqlite3_native.bundle
+- lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.2/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/constants.rb
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/database.rb
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/errors.rb
@@ -215,6 +216,7 @@ files:
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/2.7/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.0/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.1/sqlite3_native.bundle
+- lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.2/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/constants.rb
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/database.rb
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/errors.rb
@@ -262,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: 封装了自定义podfile 中pod 方法