logstash-output-hipchat 4.0.5 → 4.0.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fdf28fbc55f8cda515acec755c871e850f2d3c100ca01cb1762fc68d0fea561b
4
- data.tar.gz: 41ad0c8436d355922b05d31681a83d308486809a41161377829d1e49c8800042
3
+ metadata.gz: 2e9c432766e08aad0479acaa76a2c738dbbb669d542b4813fad6ac8a3440c959
4
+ data.tar.gz: 0f825b15939533877744d4ad8ba0674bc45e6c948d23f626d7af7029f31357f0
5
5
  SHA512:
6
- metadata.gz: 0fd745dc82c7e31d6b28620e56fbb9dc076f1164584a695975942ee29a68d63fdc1a0207f88737eee73fd817e5d4c1e8c9327d99889eda157a1d74dfa8fa5e8e
7
- data.tar.gz: 403d8b2e8ae988a808a2ee9bf418665c27de198c1027565a4e0f3c9b00231d4ad4bc1bd9ce55cb01e8e5f25d8f56c37a7c6c4e8648ece9c0f12c8fbf689885bb
6
+ metadata.gz: cc1919526c48101cb0dffd20f35b1dbd3681cc180d50f09e340c39ca7af347231d0f5a7c5c45a99fa1a7b46d095bfeefc81e83825c1c38b7556f28d0e2e984fc
7
+ data.tar.gz: 356affce10c8544c2b3fbd82317256d057d0219b2076547d0915b9e958808ad531ea618a8614db9f280643d3ad24f8888677068352e2590851fd71344286a363
data/CHANGELOG.md CHANGED
@@ -1,3 +1,6 @@
1
+ ## 4.0.6
2
+ - Change `token` config type to `password` to prevent leaking it in debug logs [#15](https://github.com/logstash-plugins/logstash-output-hipchat/pull/15)
3
+
1
4
  ## 4.0.5
2
5
  - Docs: Set the default_codec doc attribute.
3
6
 
data/LICENSE CHANGED
@@ -1,13 +1,202 @@
1
- Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
2
1
 
3
- Licensed under the Apache License, Version 2.0 (the "License");
4
- you may not use this file except in compliance with the License.
5
- You may obtain a copy of the License at
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
6
5
 
7
- http://www.apache.org/licenses/LICENSE-2.0
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
8
7
 
9
- Unless required by applicable law or agreed to in writing, software
10
- distributed under the License is distributed on an "AS IS" BASIS,
11
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- See the License for the specific language governing permissions and
13
- limitations under the License.
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright 2020 Elastic and contributors
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Logstash Plugin
2
2
 
3
- [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-output-hipchat.svg)](https://travis-ci.org/logstash-plugins/logstash-output-hipchat)
3
+ [![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-output-hipchat.svg)](https://travis-ci.com/logstash-plugins/logstash-output-hipchat)
4
4
 
5
5
  This is a plugin for [Logstash](https://github.com/elastic/logstash).
6
6
 
data/docs/index.asciidoc CHANGED
@@ -40,7 +40,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
40
40
  | <<plugins-{type}s-{plugin}-host>> |<<string,string>>|No
41
41
  | <<plugins-{type}s-{plugin}-message_format>> |<<string,string>>, one of `["html", "text"]`|No
42
42
  | <<plugins-{type}s-{plugin}-room_id>> |<<string,string>>|Yes
43
- | <<plugins-{type}s-{plugin}-token>> |<<string,string>>|Yes
43
+ | <<plugins-{type}s-{plugin}-token>> |<<password,password>>|Yes
44
44
  | <<plugins-{type}s-{plugin}-trigger_notify>> |<<boolean,boolean>>|No
45
45
  |=======================================================================
46
46
 
@@ -104,7 +104,7 @@ The ID or name of the room, support fieldref
104
104
  ===== `token`
105
105
 
106
106
  * This is a required setting.
107
- * Value type is <<string,string>>
107
+ * Value type is <<password,password>>
108
108
  * There is no default value for this setting.
109
109
 
110
110
  The HipChat authentication token.
@@ -10,7 +10,7 @@ class LogStash::Outputs::HipChat < LogStash::Outputs::Base
10
10
  config_name "hipchat"
11
11
 
12
12
  # The HipChat authentication token.
13
- config :token, :validate => :string, :required => true
13
+ config :token, :validate => :password, :required => true
14
14
 
15
15
  # The ID or name of the room, support fieldref
16
16
  config :room_id, :validate => :string, :required => true
@@ -42,9 +42,9 @@ class LogStash::Outputs::HipChat < LogStash::Outputs::Base
42
42
 
43
43
  def client
44
44
  @client ||= if @host.nil? || @host.empty?
45
- HipChat::Client.new(@token, :api_version => "v2")
45
+ HipChat::Client.new(@token.value, :api_version => "v2")
46
46
  else
47
- HipChat::Client.new(@token, :api_version => "v2", :server_url => server_url)
47
+ HipChat::Client.new(@token.value, :api_version => "v2", :server_url => server_url)
48
48
  end
49
49
  end
50
50
 
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-output-hipchat'
4
- s.version = '4.0.5'
4
+ s.version = '4.0.6'
5
5
  s.licenses = ['Apache License (2.0)']
6
6
  s.summary = "This output allows you to write events to Hipchat"
7
7
  s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -1,7 +1,7 @@
1
1
  # encoding: utf-8
2
+ require_relative "../spec_helper"
2
3
  require "logstash/outputs/hipchat"
3
4
  require "logstash/event"
4
- require_relative "../spec_helper"
5
5
 
6
6
  describe LogStash::Outputs::HipChat do
7
7
  let(:token) { "secret" }
@@ -43,7 +43,7 @@ describe LogStash::Outputs::HipChat do
43
43
  }
44
44
 
45
45
  let(:options) {
46
- super.merge({
46
+ super().merge({
47
47
  "token" => "secret",
48
48
  "room_id" => "%{my_room}",
49
49
  "from" => "%{from_who}",
@@ -69,7 +69,7 @@ describe LogStash::Outputs::HipChat do
69
69
 
70
70
  context "specified host" do
71
71
  let(:host) { "local.dev" }
72
- let(:options) { super.merge({ "host" => host }) }
72
+ let(:options) { super().merge({ "host" => host }) }
73
73
 
74
74
  before do
75
75
  expect(HipChat::Client).to receive(:new).with(token, :api_version => "v2", :server_url => "https://#{host}").and_return({ room_id => hipchat })
@@ -77,4 +77,14 @@ describe LogStash::Outputs::HipChat do
77
77
 
78
78
  include_examples "sending events"
79
79
  end
80
- end
80
+
81
+ describe "debugging `token`" do
82
+
83
+ it "should not show origin value" do
84
+ expect(output.logger).to receive(:debug).with('<password>')
85
+
86
+ output.register
87
+ output.logger.send(:debug, output.token.to_s)
88
+ end
89
+ end
90
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-hipchat
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.5
4
+ version: 4.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-06 00:00:00.000000000 Z
11
+ date: 2023-05-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -112,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
112
112
  - !ruby/object:Gem::Version
113
113
  version: '0'
114
114
  requirements: []
115
- rubyforge_project:
116
- rubygems_version: 2.6.11
115
+ rubygems_version: 3.2.33
117
116
  signing_key:
118
117
  specification_version: 4
119
118
  summary: This output allows you to write events to Hipchat