Skip to content

Mask oauth tokens & send messages as text #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryanbmilbourne wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Mask oauth tokens & send messages as text #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c1f055
Set `message_format` to `text`
ryanbmilbourne Jun 18, 2015
8b652bf
Modify token fields to use `password` form control
ryanbmilbourne Jun 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/jenkins/plugins/hipchat/impl/HipChatV2Service.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public void publish(String message, String color, boolean notify) {

JSONObject notification = new JSONObject();
notification.put("message", message);
notification.put("message_format", "text");
notification.put("color", color);
notification.put("notify", notify);
post.setRequestEntity(new StringRequestEntity(notification.toString(), "application/json", "UTF-8"));
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/jenkins/plugins/hipchat/HipChatNotifier/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">

<f:entry title="${%Auth Token}" help="/plugin/hipchat/help-projectConfig-token.html">
<f:textbox name="hipchat.token" value="${instance.token}" />
<f:password name="hipchat.token" value="${instance.token}" />
</f:entry>
<f:entry title="${%Project Room}" help="/plugin/hipchat/help-projectConfig-hipChatRoom.html">
<f:textbox name="hipchat.room" value="${instance.room}" />
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/jenkins/plugins/hipchat/HipChatNotifier/global.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<f:checkbox name="hipchat.v2Enabled" checked="${descriptor.v2Enabled}"/>
</f:entry>
<f:entry title="${%API Token}" help="/plugin/hipchat/help-globalConfig-hipChatToken.html">
<f:textbox name="hipchat.token" value="${descriptor.token}" />
<f:password name="hipchat.token" value="${descriptor.token}" />
</f:entry>
<f:entry title="${%Room}" help="/plugin/hipchat/help-globalConfig-hipChatRoom.html">
<f:textbox name="hipchat.room" value="${descriptor.room}" />
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/jenkins/plugins/hipchat/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ StartWithChanges=Started by changes from {0} ({1} file(s) changed)
Started=Starting...
BackToNormal=Back to normal
Success=Success
Failure=<b>FAILURE</b>
Failure=FAILURE
Aborted=ABORTED
NotBuilt=Not built
Unstable=UNSTABLE

JobStarted=$JOB_NAME #$BUILD_NUMBER $STATUS ($CHANGES_OR_CAUSE) (<a href="$URL">Open</a>)
JobCompleted=$JOB_NAME #$BUILD_NUMBER $STATUS after $DURATION (<a href="$URL">Open</a>)
JobStarted=$JOB_NAME #$BUILD_NUMBER $STATUS ($CHANGES_OR_CAUSE) ($URL)
JobCompleted=$JOB_NAME #$BUILD_NUMBER $STATUS after $DURATION ($URL)

Unknown=Unknown