Skip to content

Commit

Permalink
feat(jans-fido): move fidoconfig folder properties to db #9369 (#9611)
Browse files Browse the repository at this point in the history 
* feat(jans-fido): move fidoconfig folder properties to db #9369

Signed-off-by: shekhar16 shekharlaad1609@gmail.com

* feat(jans-fido): added specialized exception #9369

Signed-off-by: shekhar16 shekharlaad1609@gmail.com

---------

Signed-off-by: shekhar16 shekharlaad1609@gmail.com
Co-authored-by: Yuriy Movchan <Yuriy.Movchan@gmail.com>
  • Loading branch information
@shekhar16 @yurem @moabu
2 people authored and moabu committed Nov 7, 2024
1 parent a5da07b commit e1f382c
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 50 deletions.
27 changes: 23 additions & 4 deletions ...ocument-store/src/main/java/io/jans/service/document/store/service/DBDocumentService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class DBDocumentService implements Serializable {
public static final String displayName = "displayName";
public static final String description = "description";
public static final String alias = "jansAlias";
public static final String jansFilePath = "jansFilePath";

@Inject
private Logger logger;
Expand Down Expand Up @@ -59,7 +60,7 @@ public void init() {
/**
* Add new Document entry
*
* @param Document
* @param document
* Document
*/
public void addDocument(Document document) throws Exception {
Expand All @@ -70,7 +71,7 @@ public void addDocument(Document document) throws Exception {
/**
* Remove Document entry
*
* @param Document
* @param document
* Document
*/
public void removeDocument(Document document) throws Exception {
Expand Down Expand Up @@ -98,7 +99,7 @@ public Document getDocumentByInum(String inum) throws Exception {
/**
* Update Document entry
*
* @param Document
* @param document
* Document
*/
public void updateDocument(Document document) throws Exception {
Expand Down Expand Up @@ -185,7 +186,7 @@ public Document getDocumentByDn(String dn) throws Exception {
/**
* Get documents by DisplayName
*
* @param DisplayName
* @param displayName
* @return documents
*/
public Document getDocumentByDisplayName(String displayName) throws Exception {
Expand Down Expand Up @@ -248,4 +249,22 @@ public String baseDn() {
return String.format("ou=document,%s", "o=jans");
}

public List<Document> getDocumentsByFilePath(String filePath){
Filter searchFilter = null;
if (StringHelper.isNotEmpty(filePath)) {
String[] targetArray = new String[] { filePath };
Filter displayNameFilter = Filter.createSubstringFilter(jansFilePath, null, targetArray,
null);
searchFilter = Filter.createORFilter(displayNameFilter);
}
List<Document> result = new ArrayList<>();
try {
result = persistenceEntryManager.findEntries(getDnForDocument(null), Document.class, searchFilter, 100);
return result;
} catch (Exception e) {
logger.error("Failed to find Document : ", e);
}
return result;
}

}
19 changes: 7 additions & 12 deletions jans-fido2/server/src/main/java/io/jans/fido2/service/CertificateService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

import io.jans.fido2.model.attestation.AttestationErrorResponseType;
import io.jans.fido2.model.error.ErrorResponseFactory;
import io.jans.service.document.store.model.Document;
import io.jans.service.document.store.service.DBDocumentService;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

Expand All @@ -55,6 +57,8 @@ public class CertificateService {

@Inject
private ErrorResponseFactory errorResponseFactory;
@Inject
private DBDocumentService dbDocumentService;

public X509Certificate getCertificate(String x509certificate) {
return getCertificate(new ByteArrayInputStream(base64Service.decode(x509certificate)));
Expand Down Expand Up @@ -120,18 +124,9 @@ public Map<String, X509Certificate> getCertificatesMap(String rootCertificatePat

public List<X509Certificate> getCertificates(String rootCertificatePath) {
ArrayList<X509Certificate> certificates = new ArrayList<X509Certificate>();
Path path = FileSystems.getDefault().getPath(rootCertificatePath);
try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(path)) {
Iterator<Path> iter = directoryStream.iterator();
while (iter.hasNext()) {
Path filePath = iter.next();
if (!Files.isDirectory(filePath)) {
certificates.add(getCertificate(Files.newInputStream(filePath)));
}
}
} catch (Exception ex) {
log.error("Failed to load cert from folder: '{}'", rootCertificatePath, ex);
}
List<Document> tocCertificatesDocuments = dbDocumentService.getDocumentsByFilePath(rootCertificatePath);
for (Document certDB : tocCertificatesDocuments)
certificates.add(getCertificate(certDB.getDocument()));

return certificates;
}
Expand Down
96 changes: 62 additions & 34 deletions jans-fido2/server/src/main/java/io/jans/fido2/service/mds/TocService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import io.jans.fido2.service.app.ConfigurationFactory;
import io.jans.fido2.service.verifier.CertificateVerifier;
import io.jans.service.cdi.event.ApplicationInitialized;
import io.jans.service.document.store.exception.DocumentException;
import io.jans.service.document.store.model.Document;
import io.jans.service.document.store.service.DBDocumentService;
import io.jans.util.Pair;
Expand All @@ -37,6 +38,7 @@
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;

Expand Down Expand Up @@ -131,42 +133,47 @@ private Map<String, JsonNode> parseTOCs() {
log.warn("Fido2 MDS cert and TOC properties should be set");
return new HashMap<String, JsonNode>();
}
log.info("Populating TOC certs entries from {}", mdsTocRootCertsFolder);
log.info("Populating TOC entries from {}", mdsTocFilesFolder);

Path path = FileSystems.getDefault().getPath(mdsTocFilesFolder);
try {
List<Document> tocRootCertsDocuments = dbDocumentService.getDocumentsByFilePath(mdsTocRootCertsFolder);
} catch (Exception e) {
log.error("Failed to fetch toc Root Certs Documents ", e);
throw new DocumentException(e);
}

List<Document> tocFilesdocuments = new ArrayList<>();
try {
tocFilesdocuments = dbDocumentService.getDocumentsByFilePath(mdsTocFilesFolder);
} catch (Exception e) {
log.error("Failed to fetch toc Files Documents ", e);
throw new DocumentException(e);
}

List<Map<String, JsonNode>> maps = new ArrayList<>();
try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(path)) {
Iterator<Path> iter = directoryStream.iterator();
while (iter.hasNext()) {
Path filePath = iter.next();
for(Document document :tocFilesdocuments){
try {
Pair<LocalDate, Map<String, JsonNode>> result = parseTOC(mdsTocRootCertsFolder, filePath);
Pair<LocalDate, Map<String, JsonNode>> result = parseTOC(mdsTocRootCertsFolder, document.getDocument());
log.info("Get TOC {} entries with nextUpdate date {}", result.getSecond().size(),
result.getFirst());

maps.add(result.getSecond());
} catch (IOException e) {
log.warn("Can't access or open path: {}", filePath, e);
log.warn("Can't access or open path: {}", document.getFileName(), e);
} catch (ParseException e) {
log.warn("Can't parse path: {}", filePath, e);
log.warn("Can't parse path: {}", document.getFileName(), e);
}
}
} catch (Exception e) {
log.warn("Something wrong with path", e);
}

return mergeAndResolveDuplicateEntries(maps);
}

private Map<String, JsonNode> parseTOC(String mdsTocRootCertFile, String mdsTocFileLocation) {
try {
return parseTOC(mdsTocRootCertFile, FileSystems.getDefault().getPath(mdsTocFileLocation)).getSecond();
} catch (IOException e) {
throw new Fido2RuntimeException("Unable to read TOC at " + mdsTocFileLocation, e);
} catch (ParseException e) {
throw new Fido2RuntimeException("Unable to parse TOC at " + mdsTocFileLocation, e);
}
}
private Pair<LocalDate, Map<String, JsonNode>> parseTOC(String mdsTocRootCertsFolder, String content)
throws IOException, ParseException {
String decodedString = new String(base64Service.decode(content));
return readEntriesFromTocJWT(decodedString, mdsTocRootCertsFolder, true);
}

private Pair<LocalDate, Map<String, JsonNode>> parseTOC(String mdsTocRootCertsFolder, Path path)
throws IOException, ParseException {
Expand Down Expand Up @@ -279,24 +286,43 @@ public boolean downloadMdsFromServer(URL metadataUrl) {
Fido2Configuration fido2Configuration = appConfiguration.getFido2Configuration();

String mdsTocFilesFolder = fido2Configuration.getMdsTocsFolder();
try {
List<Document> documents = dbDocumentService.getDocumentsByFilePath(mdsTocFilesFolder);
for (Document document : documents){
dbDocumentService.removeDocument(document);
}
} catch (Exception e) {
log.error("Failed to remove old document of mdsTocFilesFolder" , e);
throw new DocumentException(e);
}

Path path = FileSystems.getDefault().getPath(mdsTocFilesFolder);
try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(path)) {
Iterator<Path> iter = directoryStream.iterator();
while (iter.hasNext()) {
Path filePath = iter.next();
try (InputStream in = metadataUrl.openStream()) {
try (InputStream in = metadataUrl.openStream()) {
byte[] sourceBytes = IOUtils.toByteArray(in);

Files.copy(in, filePath, StandardCopyOption.REPLACE_EXISTING);
String encodedString = base64Service.encodeToString(sourceBytes);

log.info("TOC file updated.");
return true;
}
Document document = new Document();
document.setFileName("mdsToc");
document.setDescription("MDS TOC JWT file");
document.setService(new ArrayList<>(Arrays.asList("Fido2 MDS")));
document.setFilePath(mdsTocFilesFolder);
try {
document.setDocument(encodedString);
document.setInum(dbDocumentService.generateInumForNewDocument());
document.setDn(dbDocumentService.getDnForDocument(document.getInum()));
document.setEnabled(true);
dbDocumentService.addDocument(document);
} catch (Exception e) {
log.error("Failed to add new document of mdsTocFilesFolder" , e);
throw new DocumentException(e);
}

log.info("TOC file updated.");
return true;
} catch (IOException e) {
log.warn("Can't access or open path: {}", path, e);
log.warn("Can't access or open path: {}", metadataUrl, e);
throw new Fido2RuntimeException("Can't access or open path: {}" + metadataUrl + e.getMessage(), e);
}
return false;
}

private void loadMetadataServiceExternalProvider() {
Expand Down Expand Up @@ -362,7 +388,8 @@ public List<String> saveMetadataServerCertsInDB(String metadataServer, String bl
try {
dbDocumentService.removeDocument(certDoc);
} catch (Exception e) {
throw new RuntimeException(e);
log.error("Failed to remove document file[ath:'" +certDoc.getFilePath()+ "' : " , e);
throw new DocumentException(e);
}
}

Expand All @@ -379,7 +406,8 @@ public List<String> saveMetadataServerCertsInDB(String metadataServer, String bl
dbDocumentService.addDocument(document);
result.add(document.getInum());
} catch (Exception e) {
throw new RuntimeException(e);
log.error("Failed to add document for '" + document.getFileName() + ", message: " + e.getMessage(), e);
throw new DocumentException(e);
}
}
}
Expand Down

0 comments on commit e1f382c

Please sign in to comment.