dingtalk-cli 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17d2d43e75a06493a7eb51e56e540cc73c6db31ddd2b4cdee60677b15fdec0c1
-  data.tar.gz: 98f136d8f3f729059bffa2022eaeafdacad45b9e5317427787e1665478419a3e
+  metadata.gz: b960d9621c524056cffedb31ee131e532843719c7e115c9a52e7ae661b7fdb75
+  data.tar.gz: 367bac3d8d3878b47cfcb5141fcc56af442a52b8ef9a1b7b117f0649d149bb45
 SHA512:
-  metadata.gz: 10502a20afd65b6738bc1e6550c0051d69c0e521b277c68114e6331cad796fcd443f56b67edafe2210377f05e3cbf9b60b08c35a273b655d70528f5c2cf8de8b
-  data.tar.gz: 867fdf91173294c773fd6e6a15b6931ad671749b1548b6cdde4ee64bb651b51cac7dd6a3a87a5bae6b46320367fd2499bc3c0a460f0d95d2354895eaaa9706cf
+  metadata.gz: 3424337d008f18df7ec5890c3657e31183655eb89d273efc3d1104580e9e8835e9f8232113ebbb33b0af8e39d292e749d07e6c1989301d3fb1e0eacb1814b342
+  data.tar.gz: 55a5a30e1d01022f3bc15bd45f3b85dec0b0fe27729fc4ba2088ca7c4d2185b1ae53ddd09c76d27d4e7405022640d63dff267b500444428a07359c78dfbf5042

data/README.md

@@ -40,9 +40,9 @@ Commands:
 
     + action-card      发送整体跳转ActionCard类型消息
     + feed-card        发送FeedCard类型消息
-    + link             发送link类型消息
-    + markdown         发送link类型消息
-    + text             发送text类型消息
+    + link             发送Link类型消息
+    + markdown         发送Markdown类型消息
+    + text             发送Text类型消息
 
 Options:
 
@@ -69,6 +69,17 @@ source ~/.bash_profile
 ```
 
 > 说明：配置的优先级为：参数配置 > 临时环境变量配置 > 全局环境变量配置
+## 功能列表
+
+- [x] 发送消息类型：Text
+- [x] 发送消息类型：Markdown
+- [x] 发送消息类型：Link
+- [x] 发送消息类型：FeedCard
+- [x] 发送消息类型：ActionCard
+- [x] 安全设置：自定义关键词
+- [x] 安全设置：加签
+- [x] 安全设置：IP地址（段）
+
 ## 开发
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/DingTalk/command/action_card.rb

@@ -8,7 +8,7 @@ module DingTalk
       self.summary = '发送整体跳转ActionCard类型消息'
 
       self.description = <<-DESC
-          发送text类型消息，消息内容为`CONTENT`
+          发送ActionCard类型消息，消息内容为`CONTENT`
       DESC
 
       self.arguments = [

data/lib/DingTalk/command/feed_card.rb

@@ -8,7 +8,7 @@ module DingTalk
       self.summary = '发送FeedCard类型消息'
 
       self.description = <<-DESC
-          发送text类型消息，消息内容为`LINK Array JSON`,格式：`[{ "title": "xxx", "pic": "https://xxx.com/icon.png", "link": "https://xxx.com/" }]`
+          发送FeedCard类型消息，消息内容为`LINK Array JSON`,格式：`[{ "title": "xxx", "pic": "https://xxx.com/icon.png", "link": "https://xxx.com/" }]`
       DESC
 
       self.arguments = [

data/lib/DingTalk/command/link.rb

@@ -5,10 +5,10 @@ require_relative '../utils/http_helper'
 module DingTalk
   class Command
     class Link < Command
-      self.summary = '发送link类型消息'
+      self.summary = '发送Link类型消息'
 
       self.description = <<-DESC
-          发送text类型消息，消息内容为`CONTENT`
+          发送Link类型消息，消息内容为`CONTENT`
       DESC
 
       self.arguments = [

data/lib/DingTalk/command/markdown.rb

@@ -5,10 +5,10 @@ require_relative '../utils/http_helper'
 module DingTalk
   class Command
     class Markdown < Command
-      self.summary = '发送link类型消息'
+      self.summary = '发送Markdown类型消息'
 
       self.description = <<-DESC
-          发送text类型消息，消息内容为`CONTENT`
+          发送Markdown类型消息，消息内容为`CONTENT`
       DESC
 
       self.arguments = [

data/lib/DingTalk/command/text.rb

@@ -5,10 +5,10 @@ require_relative '../utils/http_helper'
 module DingTalk
   class Command
     class Text < Command
-      self.summary = '发送text类型消息'
+      self.summary = '发送Text类型消息'
 
       self.description = <<-DESC
-          发送text类型消息，消息内容为`CONTENT`
+          发送Text类型消息，消息内容为`CONTENT`
       DESC
 
       self.arguments = [

data/lib/DingTalk/utils/http_helper.rb

@@ -1,5 +1,9 @@
 require 'faraday';
 require 'faraday_middleware'
+require 'uri'
+require 'json'
+require 'base64'
+require 'openssl'
 
 require_relative '../core/text'
 require_relative '../core/link'
@@ -15,31 +19,23 @@ module DingTalk
       access_token = token || ENV['DINGTALK_TOKEN']
       access_secret = token || ENV['DINGTALK_SECRET']
       return 'A message access token is required.' unless access_token
-      if access_secret then
-        timestamp = "#{ Time.now.to_i * 1000 }\n#{ access_secret }"
-
-
-
-        # Long timestamp = System.currentTimeMillis();
-        # String stringToSign = timestamp + "\n" + secret;
-        # Mac mac = Mac.getInstance("HmacSHA256");
-        # mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
-        # byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8"));
-        # return URLEncoder.encode(new String(Base64.encodeBase64(signData)),"UTF-8");
-
-
-
-
+      if access_secret.nil? || access_secret.empty? then
+        uri = URI.parse("#{ DINGTALK_URL }?access_token=#{ access_token }")
+      else
+        timestamp = "#{(Time.now.to_f * 1000).to_i}"
+        content = "#{timestamp}\n#{access_secret}".encode("utf-8")
+        hash  = OpenSSL::HMAC.digest('sha256', access_secret, content)
+        sign = Base64.strict_encode64(hash)
+        uri = URI.parse("#{ DINGTALK_URL }?access_token=#{ access_token }&timestamp=#{ timestamp }&sign=#{ sign }")
       end
-      url = "#{ DINGTALK_URL }?access_token=#{ access_token }"
       http_client = Faraday.new() do |builder|
         builder.request  :url_encoded
         builder.request  :json
         builder.response :logger
         builder.adapter  :net_http
       end
-      res = http_client.post url, params.to_json, 'Content-Type' => 'application/json'
-      res.body
+      res = http_client.post uri, params.to_json, 'Content-Type' => 'application/json'
+      JSON::pretty_generate(JSON(res.body))
     end
 
     def self.send_text(content, at_mobiles = [], is_at_all = false, token = nil, secret = nil)

data/lib/DingTalk/version.rb

@@ -1,3 +1,3 @@
 module DingTalk
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dingtalk-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - 大龙侠
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies: []
 description: 自定义钉钉群机器人 dingtalk-cli
 email: