github
/
acme4j
mirror of https://github.com/shred/acme4j
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #32 from doom369/master 

Removed duplicated code in ClientTest
pull/33/head
Richard Körber 2017-04-25 23:18:31 +02:00 committed by GitHub
parent db4bf52674 0fe7aa919e
commit 25fb4e5596
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java
View File

@ -76,7 +76,9 @@ public class ClientTest {
*/ */
public void fetchCertificate(Collection<String> domains) throws IOException, AcmeException { public void fetchCertificate(Collection<String> domains) throws IOException, AcmeException {
// Load the user key file. If there is no key file, create a new one. // Load the user key file. If there is no key file, create a new one.
KeyPair userKeyPair = loadOrCreateUserKeyPair(); // Keep this key pair in a safe place! In a production environment, you will not be
// able to access your account again if you should lose the key pair.
KeyPair userKeyPair = loadOrCreateKeyPair(USER_KEY_FILE);
// Create a session for Let's Encrypt. // Create a session for Let's Encrypt.
// Use "acme://letsencrypt.org" for production server // Use "acme://letsencrypt.org" for production server
@ -92,7 +94,7 @@ public class ClientTest {
} }
// Load or create a key pair for the domains. This should not be the userKeyPair! // Load or create a key pair for the domains. This should not be the userKeyPair!
KeyPair domainKeyPair = loadOrCreateDomainKeyPair(); KeyPair domainKeyPair = loadOrCreateKeyPair(DOMAIN_KEY_FILE);
// Generate a CSR for all of the domains, and sign it with the domain key pair. // Generate a CSR for all of the domains, and sign it with the domain key pair.
CSRBuilder csrb = new CSRBuilder(); CSRBuilder csrb = new CSRBuilder();
@ -124,45 +126,19 @@ public class ClientTest {
} }
/** /**
* Loads a user key pair from {@value #USER_KEY_FILE}. If the file does not exist, * Loads a key pair from specified file. If the file does not exist,
* a new key pair is generated and saved.
* <p>
* Keep this key pair in a safe place! In a production environment, you will not be
* able to access your account again if you should lose the key pair.
*
* @return User's {@link KeyPair}.
*/
private KeyPair loadOrCreateUserKeyPair() throws IOException {
if (USER_KEY_FILE.exists()) {
// If there is a key file, read it
try (FileReader fr = new FileReader(USER_KEY_FILE)) {
return KeyPairUtils.readKeyPair(fr);
}
} else {
// If there is none, create a new key pair and save it
KeyPair userKeyPair = KeyPairUtils.createKeyPair(KEY_SIZE);
try (FileWriter fw = new FileWriter(USER_KEY_FILE)) {
KeyPairUtils.writeKeyPair(userKeyPair, fw);
}
return userKeyPair;
}
}
/**
* Loads a domain key pair from {@value #DOMAIN_KEY_FILE}. If the file does not exist,
* a new key pair is generated and saved. * a new key pair is generated and saved.
* *
* @return Domain {@link KeyPair}. * @return {@link KeyPair}.
*/ */
private KeyPair loadOrCreateDomainKeyPair() throws IOException { private KeyPair loadOrCreateKeyPair(File file) throws IOException {
if (DOMAIN_KEY_FILE.exists()) { if (file.exists()) {
try (FileReader fr = new FileReader(DOMAIN_KEY_FILE)) { try (FileReader fr = new FileReader(file)) {
return KeyPairUtils.readKeyPair(fr); return KeyPairUtils.readKeyPair(fr);
} }
} else { } else {
KeyPair domainKeyPair = KeyPairUtils.createKeyPair(KEY_SIZE); KeyPair domainKeyPair = KeyPairUtils.createKeyPair(KEY_SIZE);
try (FileWriter fw = new FileWriter(DOMAIN_KEY_FILE)) { try (FileWriter fw = new FileWriter(file)) {
KeyPairUtils.writeKeyPair(domainKeyPair, fw); KeyPairUtils.writeKeyPair(domainKeyPair, fw);
} }
return domainKeyPair; return domainKeyPair;