Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-9440] MalformedURLException if malformed url.
  • Loading branch information
ssogabe committed Apr 29, 2011
1 parent 22cbe23 commit 36da2ae
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 23 deletions.
Expand Up @@ -12,6 +12,7 @@

import hudson.util.FormValidation;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -161,6 +162,11 @@ public FormValidation doCheckLogin(final StaplerRequest req, final StaplerRespon
if (url == null) {
return FormValidation.error(Messages.MantisProjectProperty_MantisUrlMandatory());
}
try {
new URL(url);
} catch (MalformedURLException e) {
return FormValidation.error(Messages.MantisProjectProperty_MalformedURL());
}

final String user = Util.fixEmptyAndTrim(req.getParameter("user"));
final String pass = Util.fixEmptyAndTrim(req.getParameter("pass"));
Expand Down
@@ -1,4 +1,5 @@
MantisProjectProperty.MantisUrlMandatory = Mantis URL is a mandatory field.
MantisProjectProperty.MalformedURL=Either no legal protocol could be found in a URL or the URL could not be parsed.
MantisProjectProperty.UnableToLogin = Unable to login with the user name and password.
MantisProjectProperty.DisplayName = Associated Mantis Website
MantisProjectProperty.InvalidPattern={0} not found. Specify the pattern such as [ISSUE: {0}].
Expand Down
47 changes: 24 additions & 23 deletions src/main/resources/hudson/plugins/mantis/Messages_ja.properties
@@ -1,28 +1,29 @@
MantisProjectProperty.MantisUrlMandatory = Mantis\u306EURL\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
MantisProjectProperty.UnableToLogin = \u5165\u529B\u3055\u308C\u305F\u60C5\u5831\u3067\u306F\u30ED\u30B0\u30A4\u30F3\u3067\u304D\u307E\u305B\u3093\u3002
MantisProjectProperty.MantisUrlMandatory = Mantis\u306eURL\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
MantisProjectProperty.MalformedURL=Mantis\u306eURL\u306b\u6709\u52b9\u306a\u30d7\u30ed\u30c8\u30b3\u30eb\u304c\u307f\u3064\u304b\u3089\u306a\u3044\u304b\u3001\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u3002
MantisProjectProperty.UnableToLogin = \u5165\u529b\u3055\u308c\u305f\u60c5\u5831\u3067\u306f\u30ed\u30b0\u30a4\u30f3\u3067\u304d\u307e\u305b\u3093\u3002
MantisProjectProperty.DisplayName = Associated Mantis Website
MantisProjectProperty.InvalidPattern={0}\u304C\u3042\u308A\u307E\u305B\u3093\u3002[ISSUE: {0}]\u306E\u3088\u3046\u306B\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
MantisIssueUpdater.DisplayName = \u95A2\u9023\u3059\u308BMantis\u306E\u30C1\u30B1\u30C3\u30C8\u3092\u66F4\u65B0
Updater.IssueIntegrated = {0}:{1} \u306B\u7D71\u5408\u3055\u308C\u307E\u3057\u305F\u3002 ( \u8A73\u7D30: {2} )
Updater.ChangeSet.Revision=[\u30EA\u30D3\u30B8\u30E7\u30F3] {0} {1}
Updater.ChangeSet.Author=[\u62C5\u5F53] {0}
Updater.ChangeSet.Log=[\u5909\u66F4\u5185\u5BB9] \n{0}
Updater.ChangeSet.Files.Header=[\u30D5\u30A1\u30A4\u30EB]
MantisProjectProperty.InvalidPattern={0}\u304c\u3042\u308a\u307e\u305b\u3093\u3002[ISSUE: {0}]\u306e\u3088\u3046\u306b\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
MantisIssueUpdater.DisplayName = \u95a2\u9023\u3059\u308bMantis\u306e\u30c1\u30b1\u30c3\u30c8\u3092\u66f4\u65b0
Updater.IssueIntegrated = {0}:{1} \u306b\u7d71\u5408\u3055\u308c\u307e\u3057\u305f\u3002 ( \u8a73\u7d30: {2} )
Updater.ChangeSet.Revision=[\u30ea\u30d3\u30b8\u30e7\u30f3] {0} {1}
Updater.ChangeSet.Author=[\u62c5\u5f53] {0}
Updater.ChangeSet.Log=[\u5909\u66f4\u5185\u5bb9] \n{0}
Updater.ChangeSet.Files.Header=[\u30d5\u30a1\u30a4\u30eb]
Updater.ChangeSet.Files.File={0} {1}
Updater.FailedToAddNote = \u30C1\u30B1\u30C3\u30C8 #{0}\u306B\u30B3\u30E1\u30F3\u30C8\u3092\u767B\u9332\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002(\u539F\u56E0: {1})
Updater.FailedToAddNote.StarckTrace = \u30C1\u30B1\u30C3\u30C8 #{0}\u306B\u30B3\u30E1\u30F3\u30C8\u3092\u767B\u9332\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
Updater.NoHudsonUrl = Hudson\u306EURL\u304C\u307E\u3060\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B7\u30B9\u30C6\u30E0\u753B\u9762\u3067\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
Updater.NoMantisSite = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306BMantis\u306E\u30B5\u30A4\u30C8\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
Updater.Updating=Mantis\u306E\u30C1\u30B1\u30C3\u30C8 #{0} \u3092\u66F4\u65B0\u3057\u307E\u3057\u305F\u3002
Updater.NoIssuesFound=\u30C1\u30B1\u30C3\u30C8\u306EID\u304C\u5909\u66F4\u5C65\u6B74\u306B\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3067\u3057\u305F\u3002
Updater.KeepMantisIssueIdsForNextBuild=\u3053\u306E\u30D3\u30EB\u30C9\u306F\u5931\u6557\u3057\u305F\u306E\u3067\u3001Mantis\u306E\u30C1\u30B1\u30C3\u30C8ID\u306F\u6B21\u306E\u30D3\u30EB\u30C9\u307E\u3067\u4FDD\u6301\u3057\u307E\u3059\u3002
Updater.FailedToAddNote = \u30c1\u30b1\u30c3\u30c8 #{0}\u306b\u30b3\u30e1\u30f3\u30c8\u3092\u767b\u9332\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002(\u539f\u56e0: {1})
Updater.FailedToAddNote.StarckTrace = \u30c1\u30b1\u30c3\u30c8 #{0}\u306b\u30b3\u30e1\u30f3\u30c8\u3092\u767b\u9332\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
Updater.NoHudsonUrl = Hudson\u306eURL\u304c\u307e\u3060\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30b7\u30b9\u30c6\u30e0\u753b\u9762\u3067\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
Updater.NoMantisSite = \u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306bMantis\u306e\u30b5\u30a4\u30c8\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
Updater.Updating=Mantis\u306e\u30c1\u30b1\u30c3\u30c8 #{0} \u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
Updater.NoIssuesFound=\u30c1\u30b1\u30c3\u30c8\u306eID\u304c\u5909\u66f4\u5c65\u6b74\u306b\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093\u3067\u3057\u305f\u3002
Updater.KeepMantisIssueIdsForNextBuild=\u3053\u306e\u30d3\u30eb\u30c9\u306f\u5931\u6557\u3057\u305f\u306e\u3067\u3001Mantis\u306e\u30c1\u30b1\u30c3\u30c8ID\u306f\u6b21\u306e\u30d3\u30eb\u30c9\u307e\u3067\u4fdd\u6301\u3057\u307e\u3059\u3002
MantiBuildAction.Displayname = Mantis issues
MantisSite.FailedToConnectToMantis={0}\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002(\u539F\u56E0: {1})
MantisSite.SucceedInConnectingToMantis={0}\u306B\u63A5\u7D9A\u3057\u307E\u3057\u305F\u3002
MantisSite.FailedToConnectToMantis={0}\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002(\u539f\u56e0: {1})
MantisSite.SucceedInConnectingToMantis={0}\u306b\u63a5\u7d9a\u3057\u307e\u3057\u305f\u3002
MantisSite.MantisVersion.V110=1.1.X
MantisSite.MantisVersion.V120=1.2.X
MantisSite.DetectedVersion=\u6307\u5B9A\u3057\u305FMantis\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u3001{0}\u306E\u3088\u3046\u3067\u3059\u3002
MantisLinkAnnotator.FailedToGetMantisIssue=Mantis\u306E\u30C1\u30B1\u30C3\u30C8 #{0}\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
MantisLinkAnnotator.FailedToSave=build.xml\u306B\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
Updater.IllegalMantisId=Mantis\u306E\u30C1\u30B1\u30C3\u30C8ID {0} \u304C\u6574\u6570\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
MantisLinkAnnotator.IllegalMantisId=Mantis\u306E\u30C1\u30B1\u30C3\u30C8ID "{0}" \u304C\u6574\u6570\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
MantisSite.DetectedVersion=\u6307\u5b9a\u3057\u305fMantis\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306f\u3001{0}\u306e\u3088\u3046\u3067\u3059\u3002
MantisLinkAnnotator.FailedToGetMantisIssue=Mantis\u306e\u30c1\u30b1\u30c3\u30c8 #{0}\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
MantisLinkAnnotator.FailedToSave=build.xml\u306b\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
Updater.IllegalMantisId=Mantis\u306e\u30c1\u30b1\u30c3\u30c8ID {0} \u304c\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
MantisLinkAnnotator.IllegalMantisId=Mantis\u306e\u30c1\u30b1\u30c3\u30c8ID "{0}" \u304c\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002

0 comments on commit 36da2ae

Please sign in to comment.