FCL/sf/app/jrt: comparison javamanager/javacaptain/extensionplugins/javacertstore/src/javacertstore.cpp

equal deleted inserted replaced

-:98ccebc37403
+:dc7c549001d5
 iCertsMetadataPath = "C";
 java::util::JavaOsLayer::getJavaCaptainRoot(iCertsMetadataPath, true);
 iCertsMetadataPath.append(KJavaCertsStateDir);
 iCertsMetadataPath.append(1, KFileSeparator);
 no_certs = 0;
-loadCertsMetadata(iPrimaryCertsPath);
+loadCertsMetadata(iPrimaryCertsPath, true);
-loadCertsMetadata(iSecondaryCertsPath);
+loadCertsMetadata(iSecondaryCertsPath, false);
 // loads the metadata of the smart card certificates
 vector<TrustedCertificate> trustedCerts;
 JavaSmartCardCertificatesReader::retrieveTrustedCertificates(trustedCerts);
 for (int i=0; i<trustedCerts.size(); i++)
 // reset the changes flag
 metadata->changes = false;
 }
 }
-bool JavaCertStore::readMetadataFromFiles(const std::string& cert_file_name, CERT_METADATA * metadata)
+bool JavaCertStore::readMetadataFromFiles(const std::string& aCertsLocation, const std::string& cert_file_name, CERT_METADATA * metadata)
 {
 // there are two types of metadata:
 // 1) read-only metadata (this metadata resides into file with the same name than
 //    certificate file, but with KMetadataSuffix as extension)
 // 2) read-write metadata (this metadata resides into file with the same name than
 size_t ext = cert_file_name.rfind('.');
 if (ext != string::npos)
 {
 std::string file_name_without_extension = string(cert_file_name, 0, ext);
 // read-only metadata
-std::string read_only_metadata_file_name = iPrimaryCertsPath
+std::string read_only_metadata_file_name = aCertsLocation
 + file_name_without_extension
 + KMetadataSuffix;
 std::string read_write_metadata_file_name = iCertsMetadataPath
 + file_name_without_extension
 + KStateSuffix;
 // read the read-only metadata file */
 FILE * read_only_metadata_file = fopen(read_only_metadata_file_name.c_str(),"r");
-if (read_only_metadata_file == NULL)
-{
-read_only_metadata_file_name = iSecondaryCertsPath
-+ file_name_without_extension
-+ KMetadataSuffix;
-read_only_metadata_file = fopen(read_only_metadata_file_name.c_str(),"r");
-}
 if (read_only_metadata_file != NULL)
 {
 // save the name of the metadata_file for later use
 metadata->file_name = read_write_metadata_file_name;
 if (state == STATE_UNDEFINED)
 {
 // create the file and initialize it with
 metadata->state = STATE_ENABLED;
 // create the directory (if it doesn't exist)
-if (mkDirAll(KJavaCertsStateDir))
+std::string certsStateBaseDir = "C";
+java::util::JavaOsLayer::getJavaCaptainRoot(certsStateBaseDir, true);
+if (mkDirAll(KJavaCertsStateDir, certsStateBaseDir))
 {
 // force the writing
 metadata->changes = true;
 writeMetadataIntoFile(metadata);
 }
 && strcmp(tmp + (strlen(dirent->d_name) - strlen(KCertSuffix2)),KCertSuffix2) == 0);
 if (strcmp(dirent->d_name,".")
 && strcmp(dirent->d_name,"..")
 && cert_file)
 {
-CERT_METADATA * metadata = new CERT_METADATA();
+readCert(aCertsLocation, dirent->d_name);
-if (readMetadataFromFiles(dirent->d_name, metadata))
+}
-{
+}
-int len = aCertsLocation.size() + strlen(dirent->d_name) + 1;
+closedir(dirp);
-metadata->full_path = aCertsLocation + string(dirent->d_name);
+}
-metadata->data = readCert(metadata->full_path,
+}
-&(metadata->len));
-// if the cert already exists, overwrite it: since the primary location is Z and
+void JavaCertStore::loadCertsMetadata(std::string aCertsLocation, bool primaryPath)
-// the secondary is C, this is a way to update certificates
+{
-addCertMetadataToCache(metadata, true /* overwrite*/);
+if (primaryPath || no_certs == 0)
+{
+loadCertsMetadata(aCertsLocation);
+}
+else
+{
+// secondary path: read only the roots listed into the rootslist
+std::string rootsListDir = "";
+std::string rootsListName = "";
+rootsListDir = "C";
+java::util::JavaOsLayer::getResRoot(rootsListDir, true);
+rootsListDir.append(KJavaRootsListDir);
+rootsListDir.append(1, KFileSeparator);
+rootsListName.append(KJavaRootsListName);
+FILE * rootslist = fopen((rootsListDir + rootsListName).c_str(),"r");
+if (rootslist != NULL)
+{
+// root_file_name
+int root_file_name_index = 0;
+char root_file_name[50];
+int retval;
+while ((int)(retval = getc(rootslist))!= EOF)
+{
+if (retval == 10 || retval == 13 /* CR or LF */)
+{
+if (root_file_name_index > 0)
+{
+string rootFileName = string(root_file_name, root_file_name_index);
+// reset the root file name for the next iteration
+root_file_name_index  = 0;
+root_file_name[root_file_name_index] = '\0';
+readCert(rootsListDir, rootFileName);
+}
 }
 else
 {
-delete metadata;
+root_file_name[root_file_name_index] = (char)retval;
-metadata = NULL;
+root_file_name_index++;
-}
+root_file_name[root_file_name_index] = '\0';
 }
 }
-closedir(dirp);
+if (root_file_name_index > 0)
-}
+{
-}
+string rootFileName = string(root_file_name, root_file_name_index);
+// read the root
+readCert(rootsListDir, rootFileName);
+}
+fclose(rootslist);
+}
+}
+}
+void JavaCertStore::readCert(const std::string& aCertsLocation, const std::string& aCertFileName)
+{
+CERT_METADATA * metadata = new CERT_METADATA();
+if (readMetadataFromFiles(aCertsLocation, aCertFileName, metadata))
+{
+int len = aCertsLocation.size() + aCertFileName.size() + 1;
+metadata->full_path = aCertsLocation + aCertFileName;
+metadata->data = readCert(metadata->full_path,
+&(metadata->len));
+// if the cert already exists, overwrite it: since the primary location is Z and
+// the secondary is C, this is a way to update certificates
+addCertMetadataToCache(metadata, true /* overwrite*/);
+}
+else
+{
+delete metadata;
+metadata = NULL;
+}
+}
 void JavaCertStore::addCertMetadataToCache(CERT_METADATA* metadata, bool overwrite)
 {
 vector<CERT_METADATA *>::iterator startIterator;
 startIterator = iCertsMetadata.begin();
 iCertsMetadata.push_back(metadata);
 no_certs++;
 }
 }
-bool JavaCertStore::mkDirAll(const char* aDirPath)
+bool JavaCertStore::mkDirAll(const char* aDirPath, const std::string& aBaseDir)
 {
 // split the path into single directories
 // (separated by file separator) and create
 // each of the directories
 std::string dirPath = string(aDirPath);
 int startPos = 0;
 int endPos = dirPath.find(KFileSeparator);
 while (endPos > startPos)
 {
 currentDirPath += dirPath.substr(startPos, endPos - startPos) + KFileSeparator;
-int mkdir_result = mkdir(currentDirPath.c_str(), 0666);
+int mkdir_result = mkdir((aBaseDir + currentDirPath).c_str(), 0666);
 if (mkdir_result != 0 && errno != EEXIST)
 {
 return false;
 }
 startPos = endPos + 1;
 endPos = dirPath.find(KFileSeparator, startPos);
 }
 // the last round
 currentDirPath += dirPath.substr(startPos, dirPath.size() - startPos);
-int mkdir_result = mkdir(currentDirPath.c_str(), 0666);
+int mkdir_result = mkdir((aBaseDir + currentDirPath).c_str(), 0666);
 if (mkdir_result != 0 && errno != EEXIST)
 {
 return false;
 }
 return true;

changeset 26	dc7c549001d5
parent 21	2a9601315dfc
child 72	1f0034e370aa
child 83	26b2b12093af