Skip to content

Performance Improvements: Add Cache to ServerKey and SiteKey read #634

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

Merged
merged 5 commits into from
Mar 2, 2023
Merged

Performance Improvements: Add Cache to ServerKey and SiteKey read #634

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a67ffd7
Add caching to ServerKey and SiteKey.
ggallotti Oct 28, 2022
e7d18ac
Merge branch 'master' into performance-issue
ggallotti Oct 28, 2022
366f1b8
Merge branch 'master' into performance-issue
ggallotti Dec 8, 2022
31e3bc8
Merge branch 'master' into performance-issue
ggallotti Dec 22, 2022
865b304
Merge branch 'master' into performance-issue
ggallotti Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 42 additions & 22 deletions common/src/main/java/com/genexus/util/IniFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
import java.util.concurrent.ConcurrentHashMap;

import com.genexus.*;
import com.genexus.util.*;

import com.genexus.diagnostics.core.ILogger;
import com.genexus.diagnostics.core.LogManager;
import json.org.json.*;


public class IniFile {
public static final ILogger logger = LogManager.getLogger(IniFile.class);
private static final int SECTION = 1;
private static final int PROPERTY = 2;
private static final int COMMENT = 3;
Expand All @@ -29,8 +31,8 @@ public class IniFile {
private String defaultSiteKey = "7E2E22D26FF2989E2444852A85E57867";
private String defaultServerKey = "7E2E22D26FF2989E2444852A85E57867";

private String realSiteKey;
private String realServerKey;
private String siteKey;
private String serverKey;

private static ConcurrentHashMap<String, String> s_confMapping;
private static String CONFMAPPING_FILE = "confmapping.json";
Expand All @@ -57,46 +59,64 @@ public IniFile(String filename) {

public void setEncryptionStream(InputStream is) {
this.encryptionIs = is;
ensureServerKey();
ensureSiteKey();
}

public String getServerKey() {
if (realServerKey != null)
return realServerKey;
if (serverKey != null) {
return serverKey;
}
ensureServerKey();
return serverKey;
}

realServerKey = getFromKeyFile(0);
if (realServerKey != null)
return realServerKey;
private void ensureServerKey() {
serverKey = getFromKeyFile(0);
if (serverKey != null) {
return;
}

if (encryptionIs == null)
return defaultServerKey;
if (encryptionIs == null) {
serverKey = defaultServerKey;
return;
}

try {
IniFile crypto = new IniFile(encryptionIs);
realServerKey = crypto.getProperty("Encryption", "ServerKey", null);
serverKey = crypto.getProperty("Encryption", "ServerKey", null);
} catch (Exception e) {
logger.debug("Could not read ServerKey from InputStream" , e);
}

return realServerKey == null ? defaultServerKey : realServerKey;
serverKey = serverKey == null ? defaultServerKey: serverKey;
}

public String getSiteKey() {
if (realSiteKey != null)
return realSiteKey;
if (siteKey != null) {
return siteKey;
}
ensureSiteKey();
return siteKey;
}

realSiteKey = getFromKeyFile(1);
if (realSiteKey != null)
return realSiteKey;
private void ensureSiteKey() {
siteKey = getFromKeyFile(1);
if (siteKey != null) {
return;
}

if (encryptionIs == null)
return defaultSiteKey;
if (encryptionIs == null) {
siteKey = defaultSiteKey;
return;
}

try {
IniFile crypto = new IniFile(encryptionIs);
realSiteKey = crypto.getProperty("Encryption", "SiteKey", null);
siteKey = crypto.getProperty("Encryption", "SiteKey", null);
} catch (Exception e) {
}

return realSiteKey == null ? defaultSiteKey : realSiteKey;
siteKey = siteKey == null ? defaultSiteKey : siteKey;
}

String getFromKeyFile(int lineNo) {
Expand Down