mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 22:38:35 +00:00
b564bd67d3
- Use CompositorWidgetProxy for dispatching vsync to the compositor. (bug 1269037 part 1, r=mchang) (c8b7a4240c) - Remove unused null widget checks. (bug 1269037 part 2, r=mchang) (4f4cc9952b) - Bug 1269422: Wrap Gonk widget in |CompositorWidgetProxyWrapper|. r=dvander (4513035cbf) - Remove nsBaseWidget::NewCompositorBridgeParent. (bug 1272472 part 1, r=kats) (ca813c1f2b) - Use IPDL to schedule composites on GTK. (bug 1272472 part 2, r=nical) (7402cf834e) - Use IPC to schedule composites on Windows. (bug 1272472 part 3, r=jimm) (e5d7281dd7) - Don't use nsIWidget to check APZ in LayerManagerComposite. (bug 1269653 part 1, r=kats) (79a1644111) - Restrict SetDispAcquireFence's nsIWidget access to Gonk. (bug 1269653 part 2, r=kats) (72110b7bc7) - Bug 1264764 - Move PTexture under PCompositorBridge r=nical,dvander (17e6ec7fc1) - Move CompositorThreadHolder into its own file. (bug 1273017 part 1, r=mattwoodrow) (464ede8be1) - Move CompositorBridgeParent::CompositorLoop to CompositorThreadHolder. (bug 1273017 part 2, r=mattwoodrow) (85708f3cde) - Bug 1268313: Part 1 - Be explicit about which NewRunnableMethod callers want to be able to cancel. r=froydnj (faa07aa139) - Bug 1268313: Part 2 - Replace some NewRunnableMethods with NS_NewNonOwningRunnableMethod. r=froydnj (010c43d000) - Bug 1268313: Part 3 - Replace some NewCancelableRunnableMethod with NS_NewNonOwningCancelableRunnableMethod. r=froydnj (55018ef234) - Bug 1268313: Part 4 - Replace NewCancelableRunnableMethod with NS_NewCancelableRunnableMethod. r=froydnj (c22711b35d) - Bug 1268313: Part 5 - Make NS_NewRunnableMethod able to call const functions. r=froydnj (b0f60963a3) - Bug 1268313: Part 6 - Replace NewRunnableMethod with NS_NewRunnableMethod. r=froydnj (18d40def2c) - Bug 1260950 - Set mInitialSizeFound to true when the initial size id found. r=jesup, r=pehrsons a=kwierso (5d6abe57e0) - Bug 1237176 - Notify synth start if we get a finished event without a blocking-changed event. r=roc (c1aebe903a) - Bug 911546, use a runnable so that popups don't rollup during a grab, r=karlt (a06bd44e6c) - Bug 1237617 - Call nsWindow::ForcePresent during going active r=bas.schouten (066cad8f89) - Bug 1268313: Part 7 - Move NS_NewRunnableMethod and friends to mozilla::NewRunnableMethod. r=froydnj (8b4bf34961) - Bug 1266595: Followup to fix IPDL tests. r=billm (216f2dcff5) - Bug 1268313: Fix up IPDL tests. r=billm (228348d642) - Add WinCompositorWidgetProxy. (bug 1265975 part 1, r=jimm) (bfafe7a8e2) - Implement WinCompositorWidgetProxy::GetClientSize. (bug 1265975 part 2, r=jimm) (a8710a3259) - Move the WM_SETTEXT present lock to CompositorWidgetProxy. (bug 1265975 part 3, r=jimm) (297ce28c8a) - Move transparency handling to WinCompositorWigetProxy. (bug 1265975 part 4, r=jimm) (46ba0c6d01) - Remove Windows-specific compositor calls to nsIWidget. (bug 1265975 part 5, r=jimm) (3ef157c160) - Remove plugin-related CompositorBridgeParent use of nsIWidget. (bug 1265975 part 6, r=jimm) (6d80cdd6fd) - Hide top-level CompositorBridgeParents behind a new API. (bug 1272472 part 4, r=mattwoodrow,kats,gwagner) (228c0efdb7) - Bug 1253424 - part 1 - add a already_AddRefed nsTransactionStack::Push overload; r=erahm (7059e20914) - Bug 1253424 - part 2 - add nsTransactionStack::IsEmpty; r=erahm (7e9764a146) - Bug 1254618 - modify nsTransactionStack to use nsDeque rather than std::deque; r=ehsan (5e47ea431e) - Bug 1136857 - Make DOMStorageCache::mLoaded flag atomic to prevent potential races, r=nfroyd (39aaea1de3) - Bug 1265408 - Add webidl for IIRFilterNode; r=smaug (040ce9aa43) - Bug 1265408 - Implement IIRFilterNode; r=padenot (6bf569a412) - Bug 1265408 - Import IIRFilter from blink; r=padenot (71b28c0ad2) - Bug 1265408 - Use IIRFilter from blink; r=padenot (5d058d8568) - Bug 1265408 - Add buffersAreZero to IIRFilter; r=karlt (45edba3e13) - Bug 1265408 - Avoid subnormals in IIRFilter; r=karlt (0e1ae93f0b) - Bug 1265408 - Add LogToDeveloperConsole to WebAudioUtils; r=padenot (88d5f0222a) - Bug 1268984 - Store GMPStorage on GMPServiceParent so that it persists inside the same PB session. r=gerald (17d4d0abaf) - Bug 1267905 - Replace uses of ScopedCERTCertList with UniqueCERTCertList. r=keeler (783bf11b2a) - Bug 1270005 - Replace uses of ScopedPK11SlotInfo with UniquePK11SlotInfo in PSM. r=keeler (ea9a4011aa) - Bug 1271501 - Remove unnecessary uses of reinterpret_cast in PSM. r=keeler (6be40f0a85) - Bug 1271501 - Downgrade unnecessarily strong reinterpret_casts in PSM. r=keeler (95245f00ce) - Bug 1082346 - 01. Convert PKCS12 password endian using copyAndSwapToBigEndian. r=keeler (9cc58fc550) - Bug 1082346 - 02. Test case. r=keeler r=Cykesiopka (7fb0e8abc4) - Bug 160122 - Stop using PR_smprintf in PSM. r=keeler (1e5b68819c) - Bug 1271501 - Use mozilla::BitwiseCast instead of reinterpret_cast in PSM. r=keeler (894966a2ef) - Bug 1273855: TraceLogger - Include PID in the log names in order to support browser with e10s, r=bbouvier (8cf2233db3) - Bug 1274189. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya. (4511b3d3f7) - Bug 1274189. Part 2 - remove use of FlushableTaskQueue::Flush(). r=jya. (77e745fdd1) - Bug 1274189. Part 3 - remove use of FlushableTaskQueue. r=jya (aac61dcd02) - Bug 1269963. Part 1 - Add a SyncRunnable::DispatchToThread() overload for AbstractThread. r=bobbyholley. (839752aff4) - Bug 1269672 - part1 : revert sampling rate changing of the bug1235612. (9015782e13) - Bug 1270698 - check if we need to enter buffering periodically to ensure we start buffering when running out of decoded audio/video data. r=cpearce. (16734549b7) - Bug 1271581 - use newCurrentTime, instead of GetMediaTime() to decide the nextState; r=jwwang (9c5075eada) - Bug 1224973 - Part 1: Remove MediaDecoderOwner->IsHidden(). r=cpearce,jwwang (4fde3ede5a) - Bug 1224973 - Part 2: Set MediaDecoder visibility via NotifyOwnerActivityChanged. r=cpearce,jwwang (be917202eb) - Bug 1224973 - Part 3: Plumb element visibility into MDSM. r=jya,jwwang (9ec83fa243) - Bug 1224973 - Part 4: Pref media.suspend-bkgnd-video.enabled. r=cpearce,jwwang (43413a025f) - Bug 1269408: P1. Retry InternalSeek if previous attempt failed once more data is available. r=gerald (05db58dc7c) - crude fix (0097068989) - Bug 1269408: P2. Update mochitest. r=gerald (464b4c0724) - Bug 1269408: P3. Ensure a new seek request will cancel the previous internal seek. r=gerald (6ed4b8dc95) - Bug 1269408: P4. Ensure the decoders are flushed prior performing an internal seek. r=gerald (074234067b) - Bug 1269408: P5. Only drop the seek target if it's exactly the seek target. r=gerald (88701eb05a) - Bug 1269408: P6. Add debugging information, useful when a mochitest timeout. r=gerald (ef0270ab0d) - Bug 1269408: P7. Start skip to next keyframe logic when resume point is behind current time. r=gerald (bd40ebf3bc) - Bug 1269408: P8. Add debugging log. r=gerald (e6dbd1f0a6) - Bug 1269408: P9. Move handling logic of skip to next keyframe to its own function. r=gerald (3c8039e417) - Bug 1269408: P10. Reject promise early if in error state. r=me (8af54c574e) - Bug 1224973 - Part 5: Implement suspend decoding for background video. r=cpearce,jwwang,jya (22081521e3) - Bug 1242874 - part1 : create suspened types. r=baku (d3ac9548e5) - Bug 1242874 - part2 : window's suspend attribute. r=baku, r=ehsan (1fd9dc2647) - remove allowscirpted (39ab523036) - Bug 1242874 - part3 : implement different suspended methods. r=baku, r=jwwang (25d1f27a03) - Bug 1242874 - part4 : wrap the volume/mute/suspend for notifyStartedPlaying. r=baku (b8ba3238c2) - bug 1242874 - part5 : add test. r=baku, r=ehsan (f840139b5a) - Bug 1235612 - Part 1: Implement notify media-playback. r=baku (b5ec29da20) - Bug 1235612 - Part 2: Notify audible state in NotifyStartedPlaying. r=baku (dc38583a62) - Bug 1235612 - Part 3: Implement the logic of audible state notification for agent owners. r=baku (f65b3952fa) - Bug 1235612 - Part 4: Modify check audible method. r=jwwang (73457e39eb) - Bug 1269672 - part2 : move audible data checking from MDSM to DecodedAudioDataSink. (d2c3b6874c) - Bug 1269936 - Introduce and call a runtime-wide servo initialization hook. r=heycam (d4d505d4c2) - Bug 1263778 - Rename a bunch of low-level [[Prototype]] access methods to make their interactions with statically-known and dynamically-computed [[Prototype]]s clearer. r=efaust (66bbe8e7db) - Bug 888969 - Permit a cyclic [[Prototype]] chain to be created through a Location object. r=bz, r=efaust (3e3b9cbb16) - re-apply Bug 1054906 - Implement ES6 Symbol.hasInstance 2/2; r=jandem (8d5c7573ff) - Bug 1054906 - Implement ES6 Symbol.hasInstance 1/2; r=evilpie,bz (a836904e5d) - fix misspatch (54a5f2d708) - Bug 1270349 part 1. Add IDL parser support for [LegacyUnenumerableNamedProperties]. r=peterv (8c836bc74a) - Bug 1270349 part 2. Add [LegacyUnenumerableNamedProperties] to the interfaces that specify it in DOM and HTML. r=peterv (25d3cc1377) - Bug 1270349 part 3. Add a way to ask an interface descriptor for a proxy whether its named props should be enumerable. r=peterv (0a9f804867) - Bug 1270349 part 4. Use LegacyUnenumerableNamedProperties instead of NameIsEnumerable() calls to determine whether named props on DOM proxies should be enumerable. r=peterv (82f5158963) - Bug 1270349 part 5. Use LegacyUnenumerableNamedProperties instead of passing flags to GetSupportedNames to determine whether named props on DOM proxies should be reflected in ownPropertyKeys. r=peterv (3984176834) - Bug 1270349 followup to address a review comment. r=peterv (b49f4c5335)
500 lines
14 KiB
C++
500 lines
14 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "LocalCertService.h"
|
|
|
|
#include "CryptoTask.h"
|
|
#include "ScopedNSSTypes.h"
|
|
#include "cert.h"
|
|
#include "mozilla/Casting.h"
|
|
#include "mozilla/ModuleUtils.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "nsIPK11Token.h"
|
|
#include "nsIPK11TokenDB.h"
|
|
#include "nsIX509Cert.h"
|
|
#include "nsIX509CertDB.h"
|
|
#include "nsIX509CertValidity.h"
|
|
#include "nsLiteralString.h"
|
|
#include "nsProxyRelease.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "nsString.h"
|
|
#include "pk11pub.h"
|
|
|
|
namespace mozilla {
|
|
|
|
class LocalCertTask : public CryptoTask
|
|
{
|
|
protected:
|
|
explicit LocalCertTask(const nsACString& aNickname)
|
|
: mNickname(aNickname)
|
|
{
|
|
}
|
|
|
|
nsresult RemoveExisting()
|
|
{
|
|
// Search for any existing certs with this name and remove them
|
|
nsresult rv;
|
|
|
|
for (;;) {
|
|
ScopedCERTCertificate cert(
|
|
PK11_FindCertFromNickname(mNickname.get(), nullptr));
|
|
if (!cert) {
|
|
return NS_OK; // All done
|
|
}
|
|
|
|
// Found a cert, check if generated by this service
|
|
if (!cert->isRoot) {
|
|
return NS_ERROR_UNEXPECTED; // Should be self-signed
|
|
}
|
|
|
|
NS_NAMED_LITERAL_CSTRING(commonNamePrefix, "CN=");
|
|
nsAutoCString subjectNameFromNickname(commonNamePrefix + mNickname);
|
|
if (!subjectNameFromNickname.Equals(cert->subjectName)) {
|
|
return NS_ERROR_UNEXPECTED; // Subject should match nickname
|
|
}
|
|
if (!subjectNameFromNickname.Equals(cert->issuerName)) {
|
|
return NS_ERROR_UNEXPECTED; // Issuer should match nickname
|
|
}
|
|
|
|
rv = MapSECStatus(PK11_DeleteTokenCertAndKey(cert, nullptr));
|
|
if (NS_FAILED(rv)) {
|
|
return rv; // Some error, abort the loop
|
|
}
|
|
}
|
|
}
|
|
|
|
nsCString mNickname;
|
|
};
|
|
|
|
class LocalCertGetTask final : public LocalCertTask
|
|
{
|
|
public:
|
|
LocalCertGetTask(const nsACString& aNickname,
|
|
nsILocalCertGetCallback* aCallback)
|
|
: LocalCertTask(aNickname)
|
|
, mCallback(new nsMainThreadPtrHolder<nsILocalCertGetCallback>(aCallback))
|
|
, mCert(nullptr)
|
|
{
|
|
}
|
|
|
|
private:
|
|
virtual nsresult CalculateResult() override
|
|
{
|
|
// Try to lookup an existing cert in the DB
|
|
nsresult rv = GetFromDB();
|
|
// Make a new one if getting fails
|
|
if (NS_FAILED(rv)) {
|
|
rv = Generate();
|
|
}
|
|
// If generation fails, we're out of luck
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// Validate cert, make a new one if it fails
|
|
rv = Validate();
|
|
if (NS_FAILED(rv)) {
|
|
rv = Generate();
|
|
}
|
|
// If generation fails, we're out of luck
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult Generate()
|
|
{
|
|
nsresult rv;
|
|
|
|
// Get the key slot for generation later
|
|
UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
|
|
if (!slot) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
|
|
// Remove existing certs with this name (if any)
|
|
rv = RemoveExisting();
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// Generate a new cert
|
|
NS_NAMED_LITERAL_CSTRING(commonNamePrefix, "CN=");
|
|
nsAutoCString subjectNameStr(commonNamePrefix + mNickname);
|
|
ScopedCERTName subjectName(CERT_AsciiToName(subjectNameStr.get()));
|
|
if (!subjectName) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
|
|
// Use the well-known NIST P-256 curve
|
|
SECOidData* curveOidData = SECOID_FindOIDByTag(SEC_OID_SECG_EC_SECP256R1);
|
|
if (!curveOidData) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
|
|
// Get key params from the curve
|
|
ScopedAutoSECItem keyParams(2 + curveOidData->oid.len);
|
|
keyParams.data[0] = SEC_ASN1_OBJECT_ID;
|
|
keyParams.data[1] = curveOidData->oid.len;
|
|
memcpy(keyParams.data + 2, curveOidData->oid.data, curveOidData->oid.len);
|
|
|
|
// Generate cert key pair
|
|
ScopedSECKEYPublicKey publicKey;
|
|
SECKEYPublicKey* tempPublicKey;
|
|
UniqueSECKEYPrivateKey privateKey(
|
|
PK11_GenerateKeyPair(slot.get(), CKM_EC_KEY_PAIR_GEN, &keyParams,
|
|
&tempPublicKey, true /* token */,
|
|
true /* sensitive */, nullptr));
|
|
if (!privateKey) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
publicKey = tempPublicKey;
|
|
|
|
// Create subject public key info and cert request
|
|
ScopedCERTSubjectPublicKeyInfo spki(
|
|
SECKEY_CreateSubjectPublicKeyInfo(publicKey));
|
|
if (!spki) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
ScopedCERTCertificateRequest certRequest(
|
|
CERT_CreateCertificateRequest(subjectName, spki, nullptr));
|
|
if (!certRequest) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
|
|
// Valid from one day before to 1 year after
|
|
static const PRTime oneDay = PRTime(PR_USEC_PER_SEC)
|
|
* PRTime(60) // sec
|
|
* PRTime(60) // min
|
|
* PRTime(24); // hours
|
|
|
|
PRTime now = PR_Now();
|
|
PRTime notBefore = now - oneDay;
|
|
PRTime notAfter = now + (PRTime(365) * oneDay);
|
|
ScopedCERTValidity validity(CERT_CreateValidity(notBefore, notAfter));
|
|
if (!validity) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
|
|
// Generate random serial
|
|
unsigned long serial;
|
|
// This serial in principle could collide, but it's unlikely
|
|
rv = MapSECStatus(PK11_GenerateRandomOnSlot(
|
|
slot.get(), BitwiseCast<unsigned char*, unsigned long*>(&serial),
|
|
sizeof(serial)));
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// Create the cert from these pieces
|
|
ScopedCERTCertificate cert(
|
|
CERT_CreateCertificate(serial, subjectName, validity, certRequest));
|
|
if (!cert) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
|
|
// Update the cert version to X509v3
|
|
if (!cert->version.data) {
|
|
return NS_ERROR_INVALID_POINTER;
|
|
}
|
|
*(cert->version.data) = SEC_CERTIFICATE_VERSION_3;
|
|
cert->version.len = 1;
|
|
|
|
// Set cert signature algorithm
|
|
PLArenaPool* arena = cert->arena;
|
|
if (!arena) {
|
|
return NS_ERROR_INVALID_POINTER;
|
|
}
|
|
rv = MapSECStatus(
|
|
SECOID_SetAlgorithmID(arena, &cert->signature,
|
|
SEC_OID_ANSIX962_ECDSA_SHA256_SIGNATURE, 0));
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// Encode and self-sign the cert
|
|
ScopedSECItem certDER(
|
|
SEC_ASN1EncodeItem(nullptr, nullptr, cert,
|
|
SEC_ASN1_GET(CERT_CertificateTemplate)));
|
|
if (!certDER) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
rv = MapSECStatus(
|
|
SEC_DerSignData(arena, &cert->derCert, certDER->data, certDER->len,
|
|
privateKey.get(),
|
|
SEC_OID_ANSIX962_ECDSA_SHA256_SIGNATURE));
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// Create a CERTCertificate from the signed data
|
|
ScopedCERTCertificate certFromDER(
|
|
CERT_NewTempCertificate(CERT_GetDefaultCertDB(), &cert->derCert, nullptr,
|
|
true /* perm */, true /* copyDER */));
|
|
if (!certFromDER) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
|
|
// Save the cert in the DB
|
|
rv = MapSECStatus(PK11_ImportCert(slot.get(), certFromDER, CK_INVALID_HANDLE,
|
|
mNickname.get(), false /* unused */));
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// We should now have cert in the DB, read it back in nsIX509Cert form
|
|
return GetFromDB();
|
|
}
|
|
|
|
nsresult GetFromDB()
|
|
{
|
|
nsCOMPtr<nsIX509CertDB> certDB = do_GetService(NS_X509CERTDB_CONTRACTID);
|
|
if (!certDB) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsCOMPtr<nsIX509Cert> certFromDB;
|
|
nsresult rv;
|
|
rv = certDB->FindCertByNickname(NS_ConvertASCIItoUTF16(mNickname),
|
|
getter_AddRefs(certFromDB));
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
mCert = certFromDB;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult Validate()
|
|
{
|
|
// Verify cert is self-signed
|
|
bool selfSigned;
|
|
nsresult rv = mCert->GetIsSelfSigned(&selfSigned);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
if (!selfSigned) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// Check that subject and issuer match nickname
|
|
nsXPIDLString subjectName;
|
|
nsXPIDLString issuerName;
|
|
mCert->GetSubjectName(subjectName);
|
|
mCert->GetIssuerName(issuerName);
|
|
if (!subjectName.Equals(issuerName)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
NS_NAMED_LITERAL_STRING(commonNamePrefix, "CN=");
|
|
nsAutoString subjectNameFromNickname(
|
|
commonNamePrefix + NS_ConvertASCIItoUTF16(mNickname));
|
|
if (!subjectName.Equals(subjectNameFromNickname)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsCOMPtr<nsIX509CertValidity> validity;
|
|
mCert->GetValidity(getter_AddRefs(validity));
|
|
|
|
PRTime notBefore, notAfter;
|
|
validity->GetNotBefore(¬Before);
|
|
validity->GetNotAfter(¬After);
|
|
|
|
// Ensure cert will last at least one more day
|
|
static const PRTime oneDay = PRTime(PR_USEC_PER_SEC)
|
|
* PRTime(60) // sec
|
|
* PRTime(60) // min
|
|
* PRTime(24); // hours
|
|
PRTime now = PR_Now();
|
|
if (notBefore > now ||
|
|
notAfter < (now - oneDay)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
virtual void ReleaseNSSResources() override {}
|
|
|
|
virtual void CallCallback(nsresult rv) override
|
|
{
|
|
(void) mCallback->HandleCert(mCert, rv);
|
|
}
|
|
|
|
nsMainThreadPtrHandle<nsILocalCertGetCallback> mCallback;
|
|
nsCOMPtr<nsIX509Cert> mCert; // out
|
|
};
|
|
|
|
class LocalCertRemoveTask final : public LocalCertTask
|
|
{
|
|
public:
|
|
LocalCertRemoveTask(const nsACString& aNickname,
|
|
nsILocalCertCallback* aCallback)
|
|
: LocalCertTask(aNickname)
|
|
, mCallback(new nsMainThreadPtrHolder<nsILocalCertCallback>(aCallback))
|
|
{
|
|
}
|
|
|
|
private:
|
|
virtual nsresult CalculateResult() override
|
|
{
|
|
return RemoveExisting();
|
|
}
|
|
|
|
virtual void ReleaseNSSResources() override {}
|
|
|
|
virtual void CallCallback(nsresult rv) override
|
|
{
|
|
(void) mCallback->HandleResult(rv);
|
|
}
|
|
|
|
nsMainThreadPtrHandle<nsILocalCertCallback> mCallback;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS(LocalCertService, nsILocalCertService)
|
|
|
|
LocalCertService::LocalCertService()
|
|
{
|
|
}
|
|
|
|
LocalCertService::~LocalCertService()
|
|
{
|
|
}
|
|
|
|
nsresult
|
|
LocalCertService::LoginToKeySlot()
|
|
{
|
|
nsresult rv;
|
|
|
|
// Get access to key slot
|
|
UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
|
|
if (!slot) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
|
|
// If no user password yet, set it an empty one
|
|
if (PK11_NeedUserInit(slot.get())) {
|
|
rv = MapSECStatus(PK11_InitPin(slot.get(), "", ""));
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
}
|
|
|
|
// If user has a password set, prompt to login
|
|
if (PK11_NeedLogin(slot.get()) && !PK11_IsLoggedIn(slot.get(), nullptr)) {
|
|
// Switching to XPCOM to get the UI prompt that PSM owns
|
|
nsCOMPtr<nsIPK11TokenDB> tokenDB =
|
|
do_GetService(NS_PK11TOKENDB_CONTRACTID);
|
|
if (!tokenDB) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
nsCOMPtr<nsIPK11Token> keyToken;
|
|
tokenDB->GetInternalKeyToken(getter_AddRefs(keyToken));
|
|
if (!keyToken) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
// Prompt the user to login
|
|
return keyToken->Login(false /* force */);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
LocalCertService::GetOrCreateCert(const nsACString& aNickname,
|
|
nsILocalCertGetCallback* aCallback)
|
|
{
|
|
if (NS_WARN_IF(aNickname.IsEmpty())) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
if (NS_WARN_IF(!aCallback)) {
|
|
return NS_ERROR_INVALID_POINTER;
|
|
}
|
|
|
|
// Before sending off the task, login to key slot if needed
|
|
nsresult rv = LoginToKeySlot();
|
|
if (NS_FAILED(rv)) {
|
|
aCallback->HandleCert(nullptr, rv);
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<LocalCertGetTask> task(new LocalCertGetTask(aNickname, aCallback));
|
|
return task->Dispatch("LocalCertGet");
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
LocalCertService::RemoveCert(const nsACString& aNickname,
|
|
nsILocalCertCallback* aCallback)
|
|
{
|
|
if (NS_WARN_IF(aNickname.IsEmpty())) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
if (NS_WARN_IF(!aCallback)) {
|
|
return NS_ERROR_INVALID_POINTER;
|
|
}
|
|
|
|
// Before sending off the task, login to key slot if needed
|
|
nsresult rv = LoginToKeySlot();
|
|
if (NS_FAILED(rv)) {
|
|
aCallback->HandleResult(rv);
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<LocalCertRemoveTask> task(
|
|
new LocalCertRemoveTask(aNickname, aCallback));
|
|
return task->Dispatch("LocalCertRm");
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
LocalCertService::GetLoginPromptRequired(bool* aRequired)
|
|
{
|
|
nsresult rv;
|
|
|
|
// Get access to key slot
|
|
UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
|
|
if (!slot) {
|
|
return mozilla::psm::GetXPCOMFromNSSError(PR_GetError());
|
|
}
|
|
|
|
// If no user password yet, set it an empty one
|
|
if (PK11_NeedUserInit(slot.get())) {
|
|
rv = MapSECStatus(PK11_InitPin(slot.get(), "", ""));
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
}
|
|
|
|
*aRequired = PK11_NeedLogin(slot.get()) &&
|
|
!PK11_IsLoggedIn(slot.get(), nullptr);
|
|
return NS_OK;
|
|
}
|
|
|
|
#define LOCALCERTSERVICE_CID \
|
|
{ 0x47402be2, 0xe653, 0x45d0, \
|
|
{ 0x8d, 0xaa, 0x9f, 0x0d, 0xce, 0x0a, 0xc1, 0x48 } }
|
|
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR(LocalCertService)
|
|
|
|
NS_DEFINE_NAMED_CID(LOCALCERTSERVICE_CID);
|
|
|
|
static const Module::CIDEntry kLocalCertServiceCIDs[] = {
|
|
{ &kLOCALCERTSERVICE_CID, false, nullptr, LocalCertServiceConstructor },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const Module::ContractIDEntry kLocalCertServiceContracts[] = {
|
|
{ LOCALCERTSERVICE_CONTRACTID, &kLOCALCERTSERVICE_CID },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const Module kLocalCertServiceModule = {
|
|
Module::kVersion,
|
|
kLocalCertServiceCIDs,
|
|
kLocalCertServiceContracts
|
|
};
|
|
|
|
NSMODULE_DEFN(LocalCertServiceModule) = &kLocalCertServiceModule;
|
|
|
|
} // namespace mozilla
|