Skip to content

Commit 771efa0

Browse files
caleblloydcaleblloyd
committed
merge master into netstandard2.0
2 parents a5a1f62 + 71b208f commit 771efa0

32 files changed

+416
-136
lines changed

‎.ci/config/config.buffer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
119
}
1210
}

‎.ci/config/config.compression+ssl.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",
11-
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
129
"CertificatesPath": "../../../../../.ci/server/certs"
1310
}
1411
}

‎.ci/config/config.compression.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
119
}
1210
}

‎.ci/config/config.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
119
}
1210
}

‎.ci/config/config.ssl.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",
11-
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
129
"CertificatesPath": "../../../../../.ci/server/certs"
1310
}
1411
}

‎.ci/config/config.uds+ssl.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",
11-
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
129
"CertificatesPath": "../../../../../.ci/server/certs"
1310
}
1411
}

‎.ci/config/config.uds.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
119
}
1210
}

‎.ci/test.ps1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,3 @@ dotnet test tests\SideBySide\SideBySide.csproj -c Baseline
4949
if ($LASTEXITCODE -ne 0){
5050
exit $LASTEXITCODE;
5151
}
52-
53-
echo "Building Benchmark"
54-
55-
dotnet restore tests\Benchmark\Benchmark.csproj
56-
dotnet run -p tests\Benchmark\Benchmark.csproj -c Release -f net462
57-
if ($LASTEXITCODE -ne 0){
58-
exit $LASTEXITCODE;
59-
}

‎docs/content/connection-options.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,14 @@ These are the other options that MySqlConnector supports. They are set to sensi
146146
<th style="width: 10%">Default</th>
147147
<th style="width: 70%">Descriotion</th>
148148
</thead>
149+
<tr>
150+
<td>AllowPublicKeyRetrieval, Allow Public Key Retrieval</td>
151+
<td>false</td>
152+
<td>If the user account uses <code>sha256_password</code> authentication, the password must be protected during transmission; TLS is the preferred mechanism for this,
153+
but if it is not available then RSA public key encryption will be used. To specify the server's RSA public key, use the <code>ServerRSAPublicKeyFile</code> connection
154+
string setting, or set <code>AllowPublicKeyRetrieval=True</code> to allow the client to automatically request the public key from the server. Note that <code>AllowPublicKeyRetrieval=True</code>
155+
could allow a malicious proxy to perform a MITM attack to get the plaintext password, so it is <code>False</code> by default and must be explicitly enabled.</td>
156+
</tr>
149157
<tr>
150158
<td>AllowUserVariables, Allow User Variables</td>
151159
<td>false</td>
@@ -191,6 +199,11 @@ These are the other options that MySqlConnector supports. They are set to sensi
191199
<td>false</td>
192200
<td>When set to false or no (strongly recommended), security-sensitive information, such as the password, is not returned as part of the connection if the connection is open or has ever been in an open state. Resetting the connection string resets all connection string values, including the password. Recognized values are true, false, yes, and no.</td>
193201
</tr>
202+
<tr>
203+
<td>ServerRSAPublicKeyFile, Server RSA Public Key File</td>
204+
<td></td>
205+
<td>For <code>sha256_password</code> authentication. See comments under <code>AllowPublicKeyRetrieval</code>.</td>
206+
</tr>
194207
<tr>
195208
<td>Treat Tiny As Boolean, TreatTinyAsBoolean</td>
196209
<td>true</td>

‎docs/content/overview/version-history.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@ weight: 30
1111
Version History
1212
===============
1313

14+
### 0.24.2
15+
16+
* Fix leaked session when a `MySqlException` is thrown because a query contains a user-defined variable and `Allow User Variables=false`: [#305](https://github.com/mysql-net/MySqlConnector/issues/305).
17+
18+
### 0.24.1
19+
20+
* Recover leaked sessions when `MySqlDataReader` isn't disposed: [#306](https://github.com/mysql-net/MySqlConnector/issues/306).
21+
22+
### 0.24.0
23+
24+
* **Breaking** Add `AllowPublicKeyRetrieval` connection string setting, defaulted to `false`: [#286](https://github.com/mysql-net/MySqlConnector/issues/286).
25+
* Add `ServerRSAPublicKeyFile` connection string setting.
26+
* Fix hang in `MySqlDataReader.Dispose` if function threw an exception: [#299](https://github.com/mysql-net/MySqlConnector/issues/299).
27+
* Fix `InvalidOperationException` if `MySqlBulkLoader` is used inside a transaction: [#300](https://github.com/mysql-net/MySqlConnector/issues/300).
28+
1429
### 0.23.0
1530

1631
* Support .NET 4.5: [#295](https://github.com/mysql-net/MySqlConnector/issues/295).

0 commit comments

Comments
 (0)