Skip to content

Commit 7964a40

Browse files
davidjgraphdavidjgraph
committed
16.1.0 release
1 parent b52c5b4 commit 7964a40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2339
-2176
lines changed

‎.github/workflows/build-release.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Build & Release
22

33
on:
44
push:
5-
paths:
6-
- VERSION
75

86
jobs:
97
build:

‎ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
23-DEC-2021: 16.1.0
2+
3+
- Fixes inconsistent event cursors on table lines
4+
- Fixes default lanecolor for UML frame
5+
- [conf cloud] Reduces number of comments requests
6+
- Refactor structure of WEB-INF folder
7+
18
21-DEC-2021: 16.0.3
29

310
- Adds Share and Comments in sketch File menu

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.0.3
1+
16.1.0

‎src/main/java/com/mxgraph/online/AbsAuthServlet.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import javax.servlet.http.HttpServletResponse;
2828

2929
import com.google.appengine.api.memcache.MemcacheServiceException;
30-
import com.google.appengine.api.utils.SystemProperty;
3130
import com.google.gson.Gson;
3231
import com.google.gson.JsonElement;
3332
import com.google.gson.JsonObject;
@@ -44,6 +43,9 @@ abstract public class AbsAuthServlet extends HttpServlet
4443
private static final String TOKEN_COOKIE = "auth-token";
4544
protected static final int STATE_COOKIE_AGE = 600; //10 min
4645
protected static final int TOKEN_COOKIE_AGE = 31536000; //One year
46+
public static boolean IS_GAE = (System.getProperty("com.google.appengine.runtime.version") == null) ? false : true;
47+
public static String SECRETS_DIR_PATH = IS_GAE ? "/WEB-INF/secrets/" : "/WEB-INF/";
48+
4749

4850

4951
public static final SecureRandom random = new SecureRandom();
@@ -314,7 +316,7 @@ else if ((code == null && refreshToken == null) || client == null || redirectUri
314316
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
315317
}
316318
//Non GAE runtimes are excluded from state check. TODO Change GAE stub to return null from CacheFactory
317-
else if (!"Non".equals(SystemProperty.environment.get()) && (stateToken == null || !stateToken.equals(cookieToken)))
319+
else if (IS_GAE && (stateToken == null || !stateToken.equals(cookieToken)))
318320
{
319321
log.log(Level.WARNING, "AUTH-SERVLET: [" + request.getRemoteAddr() + "] STATE MISMATCH (state: " + stateToken + " != cookie: " + cookieToken + ")");
320322
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);

‎src/main/java/com/mxgraph/online/ConverterServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class ConverterServlet extends HttpServlet
3636

3737
private static final int MAX_DIM = 5000;
3838
private static final double EMF_10thMM2PXL = 26.458;
39-
private static final String API_KEY_FILE_PATH = "/WEB-INF/cloud_convert_api_key";
39+
private static final String API_KEY_FILE_PATH = "/WEB-INF/cloud_convert_api_key"; // Not migrated to new pattern, since will not be used on diagrams.net
4040
private static final String CONVERT_SERVICE_URL = "https://api.cloudconvert.com/convert";
4141
private static final String CRLF = "\r\n";
4242
private static final String TWO_HYPHENS = "--";

‎src/main/java/com/mxgraph/online/DropboxAuthServlet.java

+15-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
@SuppressWarnings("serial")
99
public class DropboxAuthServlet extends AbsAuthServlet
1010
{
11-
public static String CLIENT_SECRET_FILE_PATH = "/WEB-INF/dropbox_client_secret";
12-
public static String CLIENT_ID_FILE_PATH = "/WEB-INF/dropbox_client_id";
11+
public static String CLIENT_SECRET_FILE_PATH = "dropbox_client_secret";
12+
public static String CLIENT_ID_FILE_PATH = "dropbox_client_id";
1313

1414
private static Config CONFIG = null;
1515

@@ -23,7 +23,7 @@ protected Config getConfig()
2323
{
2424
clientSerets = Utils
2525
.readInputStream(getServletContext()
26-
.getResourceAsStream(CLIENT_SECRET_FILE_PATH))
26+
.getResourceAsStream(getSecretPath()))
2727
.replaceAll("\n", "");
2828
}
2929
catch (IOException e)
@@ -35,7 +35,7 @@ protected Config getConfig()
3535
{
3636
clientIds = Utils
3737
.readInputStream(getServletContext()
38-
.getResourceAsStream(CLIENT_ID_FILE_PATH))
38+
.getResourceAsStream(getIdPath()))
3939
.replaceAll("\n", "");
4040
}
4141
catch (IOException e)
@@ -50,7 +50,17 @@ protected Config getConfig()
5050

5151
return CONFIG;
5252
}
53-
53+
54+
protected String getSecretPath()
55+
{
56+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_SECRET_FILE_PATH;
57+
}
58+
59+
protected String getIdPath()
60+
{
61+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_ID_FILE_PATH;
62+
}
63+
5464
public DropboxAuthServlet()
5565
{
5666
super();

‎src/main/java/com/mxgraph/online/GitHubAuthServlet.java

+22-7
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
@SuppressWarnings("serial")
99
public class GitHubAuthServlet extends AbsAuthServlet
1010
{
11-
public static String CLIENT_SECRET_FILE_PATH = "/WEB-INF/github_client_secret";
12-
public static String CLIENT_ID_FILE_PATH = "/WEB-INF/github_client_id";
13-
public static String AUTH_SERVICE_URL_FILE_PATH = "/WEB-INF/github_auth_url";
11+
public static String CLIENT_SECRET_FILE_PATH = "github_client_secret";
12+
public static String CLIENT_ID_FILE_PATH = "github_client_id";
13+
public static String AUTH_SERVICE_URL_FILE_PATH = "github_auth_url";
1414

1515
private static Config CONFIG = null;
1616

@@ -24,7 +24,7 @@ protected Config getConfig()
2424
{
2525
clientSerets = Utils
2626
.readInputStream(getServletContext()
27-
.getResourceAsStream(CLIENT_SECRET_FILE_PATH))
27+
.getResourceAsStream(getSecretPath()))
2828
.replaceAll("\n", "");
2929
}
3030
catch (IOException e)
@@ -36,7 +36,7 @@ protected Config getConfig()
3636
{
3737
clientIds = Utils
3838
.readInputStream(getServletContext()
39-
.getResourceAsStream(CLIENT_ID_FILE_PATH))
39+
.getResourceAsStream(getIdPath()))
4040
.replaceAll("\n", "");
4141
}
4242
catch (IOException e)
@@ -50,7 +50,7 @@ protected Config getConfig()
5050
{
5151
CONFIG.AUTH_SERVICE_URL = Utils
5252
.readInputStream(getServletContext()
53-
.getResourceAsStream(AUTH_SERVICE_URL_FILE_PATH))
53+
.getResourceAsStream(getServiceUrlPath()))
5454
.replaceAll("\n", "");
5555
}
5656
catch (IOException e)
@@ -63,7 +63,22 @@ protected Config getConfig()
6363

6464
return CONFIG;
6565
}
66-
66+
67+
protected String getSecretPath()
68+
{
69+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_SECRET_FILE_PATH;
70+
}
71+
72+
protected String getIdPath()
73+
{
74+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_ID_FILE_PATH;
75+
}
76+
77+
protected String getServiceUrlPath()
78+
{
79+
return AbsAuthServlet.SECRETS_DIR_PATH + AUTH_SERVICE_URL_FILE_PATH;
80+
}
81+
6782
public GitHubAuthServlet()
6883
{
6984
super();

‎src/main/java/com/mxgraph/online/GitlabAuthServlet.java

+21-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
@SuppressWarnings("serial")
99
public class GitlabAuthServlet extends AbsAuthServlet
1010
{
11-
public static String CLIENT_SECRET_FILE_PATH = "/WEB-INF/gitlab_client_secret";
12-
public static String CLIENT_ID_FILE_PATH = "/WEB-INF/gitlab_client_id";
13-
public static String AUTH_SERVICE_URL_FILE_PATH = "/WEB-INF/gitlab_auth_url";
11+
public static String CLIENT_SECRET_FILE_PATH = "gitlab_client_secret";
12+
public static String CLIENT_ID_FILE_PATH = "gitlab_client_id";
13+
public static String AUTH_SERVICE_URL_FILE_PATH = "gitlab_auth_url";
1414

1515
private static Config CONFIG = null;
1616

@@ -24,7 +24,7 @@ protected Config getConfig()
2424
{
2525
clientSerets = Utils
2626
.readInputStream(getServletContext()
27-
.getResourceAsStream(CLIENT_SECRET_FILE_PATH))
27+
.getResourceAsStream(getSecretPath()))
2828
.replaceAll("\n", "");
2929
}
3030
catch (IOException e)
@@ -36,7 +36,7 @@ protected Config getConfig()
3636
{
3737
clientIds = Utils
3838
.readInputStream(getServletContext()
39-
.getResourceAsStream(CLIENT_ID_FILE_PATH))
39+
.getResourceAsStream(getClientIdPath()))
4040
.replaceAll("\n", "");
4141
}
4242
catch (IOException e)
@@ -50,7 +50,7 @@ protected Config getConfig()
5050
{
5151
CONFIG.AUTH_SERVICE_URL = Utils
5252
.readInputStream(getServletContext()
53-
.getResourceAsStream(AUTH_SERVICE_URL_FILE_PATH))
53+
.getResourceAsStream(getServiceUrlPath()))
5454
.replaceAll("\n", "");
5555
}
5656
catch (IOException e)
@@ -64,6 +64,21 @@ protected Config getConfig()
6464
return CONFIG;
6565
}
6666

67+
protected String getSecretPath()
68+
{
69+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_SECRET_FILE_PATH;
70+
}
71+
72+
protected String getClientIdPath()
73+
{
74+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_ID_FILE_PATH;
75+
}
76+
77+
protected String getServiceUrlPath()
78+
{
79+
return AbsAuthServlet.SECRETS_DIR_PATH + AUTH_SERVICE_URL_FILE_PATH;
80+
}
81+
6782
public GitlabAuthServlet()
6883
{
6984
super();

‎src/main/java/com/mxgraph/online/GoogleAuthServlet.java

+15-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
@SuppressWarnings("serial")
2020
public class GoogleAuthServlet extends AbsAuthServlet
2121
{
22-
public static String CLIENT_SECRET_FILE_PATH = "/WEB-INF/google_client_secret";
23-
public static String CLIENT_ID_FILE_PATH = "/WEB-INF/google_client_id";
22+
public static String CLIENT_SECRET_FILE_PATH = "google_client_secret";
23+
public static String CLIENT_ID_FILE_PATH = "google_client_id";
2424

2525
private static Config CONFIG = null;
2626

@@ -34,7 +34,7 @@ protected Config getConfig()
3434
{
3535
clientSerets = Utils
3636
.readInputStream(getServletContext()
37-
.getResourceAsStream(CLIENT_SECRET_FILE_PATH))
37+
.getResourceAsStream(getSecretPath()))
3838
.replaceAll("\n", "");
3939
}
4040
catch (IOException e)
@@ -46,7 +46,7 @@ protected Config getConfig()
4646
{
4747
clientIds = Utils
4848
.readInputStream(getServletContext()
49-
.getResourceAsStream(CLIENT_ID_FILE_PATH))
49+
.getResourceAsStream(getClientIdPath()))
5050
.replaceAll("\n", "");
5151
}
5252
catch (IOException e)
@@ -61,7 +61,17 @@ protected Config getConfig()
6161

6262
return CONFIG;
6363
}
64-
64+
65+
protected String getSecretPath()
66+
{
67+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_SECRET_FILE_PATH;
68+
}
69+
70+
protected String getClientIdPath()
71+
{
72+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_ID_FILE_PATH;
73+
}
74+
6575
public GoogleAuthServlet()
6676
{
6777
super();

‎src/main/java/com/mxgraph/online/MSGraphAuthServlet.java

+14-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
@SuppressWarnings("serial")
99
public class MSGraphAuthServlet extends AbsAuthServlet
1010
{
11-
public static String CLIENT_SECRET_FILE_PATH = "/WEB-INF/msgraph_client_secret";
12-
public static String CLIENT_ID_FILE_PATH = "/WEB-INF/msgraph_client_id";
11+
public static String CLIENT_SECRET_FILE_PATH = "msgraph_client_secret";
12+
public static String CLIENT_ID_FILE_PATH = "msgraph_client_id";
1313

1414
private static Config CONFIG = null;
1515

@@ -23,7 +23,7 @@ protected Config getConfig()
2323
{
2424
clientSerets = Utils
2525
.readInputStream(getServletContext()
26-
.getResourceAsStream(CLIENT_SECRET_FILE_PATH))
26+
.getResourceAsStream(getSecretPath()))
2727
.replaceAll("\n", "");
2828
}
2929
catch (IOException e)
@@ -35,7 +35,7 @@ protected Config getConfig()
3535
{
3636
clientIds = Utils
3737
.readInputStream(getServletContext()
38-
.getResourceAsStream(CLIENT_ID_FILE_PATH))
38+
.getResourceAsStream(getIdPath()))
3939
.replaceAll("\n", "");
4040
}
4141
catch (IOException e)
@@ -51,6 +51,16 @@ protected Config getConfig()
5151
return CONFIG;
5252
}
5353

54+
protected String getSecretPath()
55+
{
56+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_SECRET_FILE_PATH;
57+
}
58+
59+
protected String getIdPath()
60+
{
61+
return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_ID_FILE_PATH;
62+
}
63+
5464
public MSGraphAuthServlet()
5565
{
5666
super();

‎src/main/webapp/WEB-INF/lib/appengine-api-1.0-sdk-1.9.92.jar

-16.4 MB
Binary file not shown.

‎src/main/webapp/WEB-INF/lib/javax.servlet-api-3.1.0.jar

-93.6 KB
Binary file not shown.

‎src/main/webapp/WEB-INF/lib/pusher-http-java-1.1.0.jar

-21.5 KB
Binary file not shown.

‎src/main/webapp/WEB-INF/secrets/atlas_client_id

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9KeGVvzyTGTf7SirRRfjvClOF7O7palj/:::/d59TBShpA0bBEEUCHNm2wIHGwj9WNdWl

‎src/main/webapp/WEB-INF/secrets/atlas_client_secret

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cTj3hgfz640aiDqyET2TWEwx-zmQ46aFlObQkUgtDPcKV0n_33wrEc6QLX8csv7_/:::/_bM2FeXeCLL0oeiyaG8SHG8VQ5gFqptudXwI05WW06kn00GV9w0W4Q__cRlYoQK-

‎src/main/webapp/WEB-INF/secrets/cloud_convert_api_key

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FTqrd43mhNIBDcM2ui2zOrZhvkebm7wha3U5OyAbyv2Q2cWMoDsH1h7tiVihFkLT

‎src/main/webapp/WEB-INF/secrets/dropbox_client_id

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libwls2fa9szdji

‎src/main/webapp/WEB-INF/secrets/dropbox_client_secret

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
geznqz5ylfn2bs6

‎src/main/webapp/WEB-INF/github_auth_url ‎src/main/webapp/WEB-INF/secrets/github_auth_url

File renamed without changes.

‎src/main/webapp/WEB-INF/secrets/github_client_id

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4f88e2ec436d76c2ee6e/:::/23bc97120b9035515661/:::/Iv1.98d62f0431e40543/:::/Iv1.1218f5567fbc258a

‎src/main/webapp/WEB-INF/secrets/github_client_secret

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
28c554413feab0197ce6811b307bfabc280fce0f/:::/9e2e963a74bd42130a443081ff8441c1e8c5077e/:::/04154a64ffae857408ceaab91e830905e1ef7170/:::/933b28017e57d85b45dd127712de9b1f475bfdcb

‎src/main/webapp/WEB-INF/gitlab_auth_url ‎src/main/webapp/WEB-INF/secrets/gitlab_auth_url

File renamed without changes.

‎src/main/webapp/WEB-INF/secrets/gitlab_client_id

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c9b9d3fcdce2dec7abe3ab21ad8123d89ac272abb7d0883f08923043e80f3e36

‎src/main/webapp/WEB-INF/secrets/gitlab_client_secret

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7ac6a0640bf2e622a68db8739bee012b310fcb6efd98d7a0b2c176869ad12831

‎src/main/webapp/WEB-INF/secrets/google_client_id

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
850530949725.apps.googleusercontent.com/:::/671128082532-jhphbq6d0e1gnsus9mn7vf8a6fjn10mp.apps.googleusercontent.com/:::/184079235871-pjf5nn0lff27lk8qf0770gmffiv9gt61.apps.googleusercontent.com

‎src/main/webapp/WEB-INF/secrets/google_client_secret

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
XtzCF2u3gSCKYr7GrKPrztID/:::/p3a9HEMaJN-OQFPo1cxi4Qxr/:::/jSvG60YtPyde__8vhy5NlQuE

‎src/main/webapp/WEB-INF/secrets/iconfinder_client_id

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
68HG47bBWRxn4hz9h59FqGmv1vT0WNv4ytVhX7eU7tzE7snQ3ARQUNZHGrincJzZ

‎src/main/webapp/WEB-INF/secrets/iconfinder_client_secret

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
PzEwBnRuQ7UPGGOy70gYu3MyxxdAlvLBqju2HDxt0OfRNZjfdUyfquPzJXSWIluK

‎src/main/webapp/WEB-INF/secrets/msgraph_client_id

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
45c10911-200f-4e27-a666-9e9fca147395/:::/aae1c620-4caf-41b3-9633-f6d0b6347dd9/:::/1afa9b7e-2533-4d86-83c0-c4d4678eca0e/:::/2e598409-107f-4b59-89ca-d7723c8e00a4/:::/b5ff67d6-3155-4fca-965a-59a3655c4476/:::/417a451a-a343-4788-b6c1-901e63182565

‎src/main/webapp/WEB-INF/secrets/msgraph_client_secret

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
soqneEMSQGP322-~!qyF71%/:::/pCXkg8bOQ_oN/v/lexxn-CH6BfcrcK99/:::/ye:A.XZ7lJ[ersdyLn5-kA497oAcVIAr/:::/cpSCY193#^?jrruaVOTV71:/:::/xV@@F8C-Hq/h8SL09qx]vyB?GxZ.8SZ3/:::/FGf7Q~izSDqfJ6YLcpu~QrpdxqiUfzvJeSz5g

‎src/main/webapp/WEB-INF/secrets/old_github_client_secret

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
49f05824e20a11b6a861dc0e3f99c39549c711ce

‎src/main/webapp/WEB-INF/secrets/old_github_dev_client_secret

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9e2e963a74bd42130a443081ff8441c1e8c5077e

‎src/main/webapp/WEB-INF/secrets/pusher.properties

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
app_id=654360
2+
key=1e756b07a690c5bdb054
3+
secret=860f452fe477026ff01f
4+
cluster=eu

0 commit comments

Comments
 (0)