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

Jump to bottom

Feature | Added caching for Always Encrypted with secure enclaves #1189

Merged

ulvii merged 26 commits into microsoft:dev from rene-ye:aeRegression

Dec 7, 2019

Member

rene-ye commented Nov 22, 2019 •

edited

Loading

Adds the following

AAS Enclave Provider
AAS/VSM Certificate cache
Enclave Session cache

rene-ye added 8 commits

November 14, 2019 15:26


          Add AAS provider

3b099d9


          Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into ae…

5871fc8

…Regression

# Conflicts:
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
#	src/main/java/com/microsoft/sqlserver/jdbc/SQLServerVSMEnclaveProvider.java


          add caches

a3471ff


          Remove weird connection formatting

d8b9366


          format

a46fa16


          Fix test

b275112


          Fix to connection

f11188a


          Change hashmap to hashtable

488837c

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerVSMEnclaveProvider.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java Outdated Show resolved Hide resolved


          Some test fixes

6bdd7bb

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerEnclaveProvider.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerEnclaveProvider.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java

+                  }
+                  @Override
+                  public void invalidateEnclaveSession() {

Member

lilgreenbird Nov 27, 2019

this still isn't used, when do we need to call this?

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java

+                          if (null == rs) {
+                              // No results. Meaning no parameter.
+                              // Should never happen.
+                              return enclaveRequestedCEKs;

Member

lilgreenbird Nov 27, 2019

should we log something?

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java

		}


		class JWTCertificateEntry {

Member

lilgreenbird Nov 27, 2019

general comment (applies elsewhere too)
Can we add comments to these classes? I know they're not public so no need for javadocs, but would be nice to have some descriptions on what these are

rene-ye added 7 commits

November 27, 2019 12:02


          Added VSM cache

0b4085a


          AAS cache

b0057a2


          debug lines

f1ba74c


          Fix counter issues

635da69


          Fix javadoc

f554f84


          Changs to removing table entries

f42d9e8


          Fix timeout inaccuracies

276f16f

ulvii requested review from peterbae and ulvii

November 29, 2019 21:21

ulvii added this to the 8.1.1 milestone

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java Outdated Show resolved Hide resolved

ulvii reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerEnclaveProvider.java Show resolved Hide resolved

ulvii reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java Outdated Show resolved Hide resolved

ulvii reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java Show resolved Hide resolved

ulvii changed the title ~~Caching for AEv2~~ Feature | Added caching for Always Encrypted with secure enclaves

peterbae reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerEnclaveProvider.java Outdated Show resolved Hide resolved

peterbae reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerEnclaveProvider.java Outdated Show resolved Hide resolved

peterbae reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerEnclaveProvider.java Outdated Show resolved Hide resolved

peterbae reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAASEnclaveProvider.java Outdated Show resolved Hide resolved

rene-ye added 3 commits

December 5, 2019 14:04


          review comments

cffcd95


          Pom formatting revert

ad2b0ec


          some more changes

c53ae67

lilgreenbird mentioned this pull request

Updated AEv2 test to check for AAS type #1198

Closed

rene-ye added 4 commits

December 5, 2019 15:37


          FIx nullptr

8fafab0


          fix test

758cee6


          debug line for CI

0d5e693


          more debug

24fe608

ulvii added this to Under Peer Review in MSSQL JDBC

rene-ye added 3 commits

December 6, 2019 12:49


          print stack trace

8d14b4b


          shrink code

c9b91ba


          cleanup

13d041a

ulvii approved these changes

View reviewed changes

ulvii merged commit 77f9f10 into microsoft:dev

MSSQL JDBC automation moved this from Under Peer Review to Closed/Merged PRs

ulvii pushed a commit that referenced this pull request


          Feature | Added caching for Always Encrypted with secure enclaves (#1189

2bc048f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment