Skip to content

Commit 4c6bdbc

Browse files
Found reliance on default encoding in org.jenkinsci.plugins.database.mysql.MySQLDatabase$DescriptorImpl.doCheckProperties(String): new java.io.InputStreamReader(InputStream) [org.jenkinsci.plugins.database.mysql.MySQLDatabase$DescriptorImpl] At MySQLDatabase.java:[line 60] DM_DEFAULT_ENCODING
1 parent 832506e commit 4c6bdbc

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/main/java/org/jenkinsci/plugins/database/mysql/MySQLDatabase.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,12 @@
88
import hudson.util.Secret;
99
import org.jenkinsci.plugins.database.AbstractRemoteDatabase;
1010
import org.jenkinsci.plugins.database.AbstractRemoteDatabaseDescriptor;
11-
import org.jenkinsci.plugins.database.BasicDataSource2;
12-
import org.jenkinsci.plugins.database.Database;
13-
import org.jenkinsci.plugins.database.DatabaseDescriptor;
1411
import org.kohsuke.stapler.DataBoundConstructor;
1512
import org.kohsuke.stapler.QueryParameter;
1613

17-
import javax.sql.DataSource;
1814
import java.io.IOException;
1915
import java.io.InputStreamReader;
20-
import java.sql.Connection;
21-
import java.sql.SQLException;
16+
import java.nio.charset.Charset;
2217
import java.util.Map;
2318
import java.util.Properties;
2419
import java.util.Set;
@@ -57,7 +52,8 @@ public FormValidation doCheckProperties(@QueryParameter String properties) throw
5752
if (validPropertyNames==null) {
5853
// this computation depends on the implementation details of MySQL JDBC connector
5954
GroovyShell gs = new GroovyShell(getClass().getClassLoader());
60-
validPropertyNames = (Set<String>)gs.evaluate(new InputStreamReader(MySQLDatabase.class.getResourceAsStream("validate.groovy")));
55+
validPropertyNames = (Set<String>) gs.evaluate ( new InputStreamReader ( MySQLDatabase.class.getResourceAsStream ( "validate.groovy" ),
56+
Charset.forName ( "UTF-8" ) ) );
6157
}
6258
Properties props = Util.loadProperties(properties);
6359
for (Map.Entry e : props.entrySet()) {

0 commit comments

Comments
 (0)