mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +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)
665 lines
20 KiB
C++
665 lines
20 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "nsCertOverrideService.h"
|
|
|
|
#include "NSSCertDBTrustDomain.h"
|
|
#include "ScopedNSSTypes.h"
|
|
#include "SharedSSLState.h"
|
|
#include "nsAppDirectoryServiceDefs.h"
|
|
#include "nsCRT.h"
|
|
#include "nsILineInputStream.h"
|
|
#include "nsIObserver.h"
|
|
#include "nsIObserverService.h"
|
|
#include "nsIX509Cert.h"
|
|
#include "nsNSSCertHelper.h"
|
|
#include "nsNSSCertificate.h"
|
|
#include "nsNSSComponent.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsISafeOutputStream.h"
|
|
#include "nsPromiseFlatString.h"
|
|
#include "nsStreamUtils.h"
|
|
#include "nsStringBuffer.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "ssl.h" // For SSL_ClearSessionCache
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::psm;
|
|
|
|
#define CERT_OVERRIDE_FILE_NAME "cert_override.txt"
|
|
|
|
void
|
|
nsCertOverride::convertBitsToString(OverrideBits ob, nsACString &str)
|
|
{
|
|
str.Truncate();
|
|
|
|
if (ob & ob_Mismatch)
|
|
str.Append('M');
|
|
|
|
if (ob & ob_Untrusted)
|
|
str.Append('U');
|
|
|
|
if (ob & ob_Time_error)
|
|
str.Append('T');
|
|
}
|
|
|
|
void
|
|
nsCertOverride::convertStringToBits(const nsACString &str, OverrideBits &ob)
|
|
{
|
|
const nsPromiseFlatCString &flat = PromiseFlatCString(str);
|
|
const char *walk = flat.get();
|
|
|
|
ob = ob_None;
|
|
|
|
for ( ; *walk; ++walk)
|
|
{
|
|
switch (*walk)
|
|
{
|
|
case 'm':
|
|
case 'M':
|
|
ob = (OverrideBits)(ob | ob_Mismatch);
|
|
break;
|
|
|
|
case 'u':
|
|
case 'U':
|
|
ob = (OverrideBits)(ob | ob_Untrusted);
|
|
break;
|
|
|
|
case 't':
|
|
case 'T':
|
|
ob = (OverrideBits)(ob | ob_Time_error);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(nsCertOverrideService,
|
|
nsICertOverrideService,
|
|
nsIObserver,
|
|
nsISupportsWeakReference)
|
|
|
|
nsCertOverrideService::nsCertOverrideService()
|
|
: monitor("nsCertOverrideService.monitor")
|
|
{
|
|
}
|
|
|
|
nsCertOverrideService::~nsCertOverrideService()
|
|
{
|
|
}
|
|
|
|
nsresult
|
|
nsCertOverrideService::Init()
|
|
{
|
|
if (!NS_IsMainThread()) {
|
|
NS_NOTREACHED("nsCertOverrideService initialized off main thread");
|
|
return NS_ERROR_NOT_SAME_THREAD;
|
|
}
|
|
|
|
// Note that the names of these variables would seem to indicate that at one
|
|
// point another hash algorithm was used and is still supported for backwards
|
|
// compatibility. This is not the case. It has always been SHA256.
|
|
mOidTagForStoringNewHashes = SEC_OID_SHA256;
|
|
mDottedOidForStoringNewHashes.Assign("OID.2.16.840.1.101.3.4.2.1");
|
|
|
|
nsCOMPtr<nsIObserverService> observerService =
|
|
mozilla::services::GetObserverService();
|
|
|
|
// If we cannot add ourselves as a profile change observer, then we will not
|
|
// attempt to read/write any settings file. Otherwise, we would end up
|
|
// reading/writing the wrong settings file after a profile change.
|
|
if (observerService) {
|
|
observerService->AddObserver(this, "profile-before-change", true);
|
|
observerService->AddObserver(this, "profile-do-change", true);
|
|
// simulate a profile change so we read the current profile's settings file
|
|
Observe(nullptr, "profile-do-change", nullptr);
|
|
}
|
|
|
|
SharedSSLState::NoteCertOverrideServiceInstantiated();
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCertOverrideService::Observe(nsISupports *,
|
|
const char *aTopic,
|
|
const char16_t *aData)
|
|
{
|
|
// check the topic
|
|
if (!nsCRT::strcmp(aTopic, "profile-before-change")) {
|
|
// The profile is about to change,
|
|
// or is going away because the application is shutting down.
|
|
|
|
RemoveAllFromMemory();
|
|
} else if (!nsCRT::strcmp(aTopic, "profile-do-change")) {
|
|
// The profile has already changed.
|
|
// Now read from the new profile location.
|
|
// we also need to update the cached file location
|
|
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
|
|
nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(mSettingsFile));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
mSettingsFile->AppendNative(NS_LITERAL_CSTRING(CERT_OVERRIDE_FILE_NAME));
|
|
} else {
|
|
mSettingsFile = nullptr;
|
|
}
|
|
Read();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
nsCertOverrideService::RemoveAllFromMemory()
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
mSettingsTable.Clear();
|
|
}
|
|
|
|
void
|
|
nsCertOverrideService::RemoveAllTemporaryOverrides()
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
for (auto iter = mSettingsTable.Iter(); !iter.Done(); iter.Next()) {
|
|
nsCertOverrideEntry *entry = iter.Get();
|
|
if (entry->mSettings.mIsTemporary) {
|
|
entry->mSettings.mCert = nullptr;
|
|
iter.Remove();
|
|
}
|
|
}
|
|
// no need to write, as temporaries are never written to disk
|
|
}
|
|
|
|
nsresult
|
|
nsCertOverrideService::Read()
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
|
|
// If we don't have a profile, then we won't try to read any settings file.
|
|
if (!mSettingsFile)
|
|
return NS_OK;
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsIInputStream> fileInputStream;
|
|
rv = NS_NewLocalFileInputStream(getter_AddRefs(fileInputStream), mSettingsFile);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
nsCOMPtr<nsILineInputStream> lineInputStream = do_QueryInterface(fileInputStream, &rv);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
nsAutoCString buffer;
|
|
bool isMore = true;
|
|
int32_t hostIndex = 0, algoIndex, fingerprintIndex, overrideBitsIndex, dbKeyIndex;
|
|
|
|
/* file format is:
|
|
*
|
|
* host:port \t fingerprint-algorithm \t fingerprint \t override-mask \t dbKey
|
|
*
|
|
* where override-mask is a sequence of characters,
|
|
* M meaning hostname-Mismatch-override
|
|
* U meaning Untrusted-override
|
|
* T meaning Time-error-override (expired/not yet valid)
|
|
*
|
|
* if this format isn't respected we move onto the next line in the file.
|
|
*/
|
|
|
|
while (isMore && NS_SUCCEEDED(lineInputStream->ReadLine(buffer, &isMore))) {
|
|
if (buffer.IsEmpty() || buffer.First() == '#') {
|
|
continue;
|
|
}
|
|
|
|
// this is a cheap, cheesy way of parsing a tab-delimited line into
|
|
// string indexes, which can be lopped off into substrings. just for
|
|
// purposes of obfuscation, it also checks that each token was found.
|
|
// todo: use iterators?
|
|
if ((algoIndex = buffer.FindChar('\t', hostIndex) + 1) == 0 ||
|
|
(fingerprintIndex = buffer.FindChar('\t', algoIndex) + 1) == 0 ||
|
|
(overrideBitsIndex = buffer.FindChar('\t', fingerprintIndex) + 1) == 0 ||
|
|
(dbKeyIndex = buffer.FindChar('\t', overrideBitsIndex) + 1) == 0) {
|
|
continue;
|
|
}
|
|
|
|
const nsASingleFragmentCString &tmp = Substring(buffer, hostIndex, algoIndex - hostIndex - 1);
|
|
const nsASingleFragmentCString &algo_string = Substring(buffer, algoIndex, fingerprintIndex - algoIndex - 1);
|
|
const nsASingleFragmentCString &fingerprint = Substring(buffer, fingerprintIndex, overrideBitsIndex - fingerprintIndex - 1);
|
|
const nsASingleFragmentCString &bits_string = Substring(buffer, overrideBitsIndex, dbKeyIndex - overrideBitsIndex - 1);
|
|
const nsASingleFragmentCString &db_key = Substring(buffer, dbKeyIndex, buffer.Length() - dbKeyIndex);
|
|
|
|
nsAutoCString host(tmp);
|
|
nsCertOverride::OverrideBits bits;
|
|
nsCertOverride::convertStringToBits(bits_string, bits);
|
|
|
|
int32_t port;
|
|
int32_t portIndex = host.RFindChar(':');
|
|
if (portIndex == kNotFound)
|
|
continue; // Ignore broken entries
|
|
|
|
nsresult portParseError;
|
|
nsAutoCString portString(Substring(host, portIndex+1));
|
|
port = portString.ToInteger(&portParseError);
|
|
if (NS_FAILED(portParseError))
|
|
continue; // Ignore broken entries
|
|
|
|
host.Truncate(portIndex);
|
|
|
|
AddEntryToList(host, port,
|
|
nullptr, // don't have the cert
|
|
false, // not temporary
|
|
algo_string, fingerprint, bits, db_key);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsCertOverrideService::Write()
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
|
|
// If we don't have any profile, then we won't try to write any file
|
|
if (!mSettingsFile) {
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsIOutputStream> fileOutputStream;
|
|
rv = NS_NewSafeLocalFileOutputStream(getter_AddRefs(fileOutputStream),
|
|
mSettingsFile,
|
|
-1,
|
|
0600);
|
|
if (NS_FAILED(rv)) {
|
|
NS_ERROR("failed to open cert_warn_settings.txt for writing");
|
|
return rv;
|
|
}
|
|
|
|
// get a buffered output stream 4096 bytes big, to optimize writes
|
|
nsCOMPtr<nsIOutputStream> bufferedOutputStream;
|
|
rv = NS_NewBufferedOutputStream(getter_AddRefs(bufferedOutputStream), fileOutputStream, 4096);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
static const char kHeader[] =
|
|
"# PSM Certificate Override Settings file" NS_LINEBREAK
|
|
"# This is a generated file! Do not edit." NS_LINEBREAK;
|
|
|
|
/* see ::Read for file format */
|
|
|
|
uint32_t unused;
|
|
bufferedOutputStream->Write(kHeader, sizeof(kHeader) - 1, &unused);
|
|
|
|
static const char kTab[] = "\t";
|
|
for (auto iter = mSettingsTable.Iter(); !iter.Done(); iter.Next()) {
|
|
nsCertOverrideEntry *entry = iter.Get();
|
|
|
|
const nsCertOverride &settings = entry->mSettings;
|
|
if (settings.mIsTemporary) {
|
|
continue;
|
|
}
|
|
|
|
nsAutoCString bits_string;
|
|
nsCertOverride::convertBitsToString(settings.mOverrideBits, bits_string);
|
|
|
|
bufferedOutputStream->Write(entry->mHostWithPort.get(),
|
|
entry->mHostWithPort.Length(), &unused);
|
|
bufferedOutputStream->Write(kTab, sizeof(kTab) - 1, &unused);
|
|
bufferedOutputStream->Write(settings.mFingerprintAlgOID.get(),
|
|
settings.mFingerprintAlgOID.Length(), &unused);
|
|
bufferedOutputStream->Write(kTab, sizeof(kTab) - 1, &unused);
|
|
bufferedOutputStream->Write(settings.mFingerprint.get(),
|
|
settings.mFingerprint.Length(), &unused);
|
|
bufferedOutputStream->Write(kTab, sizeof(kTab) - 1, &unused);
|
|
bufferedOutputStream->Write(bits_string.get(),
|
|
bits_string.Length(), &unused);
|
|
bufferedOutputStream->Write(kTab, sizeof(kTab) - 1, &unused);
|
|
bufferedOutputStream->Write(settings.mDBKey.get(),
|
|
settings.mDBKey.Length(), &unused);
|
|
bufferedOutputStream->Write(NS_LINEBREAK, NS_LINEBREAK_LEN, &unused);
|
|
}
|
|
|
|
// All went ok. Maybe except for problems in Write(), but the stream detects
|
|
// that for us
|
|
nsCOMPtr<nsISafeOutputStream> safeStream = do_QueryInterface(bufferedOutputStream);
|
|
NS_ASSERTION(safeStream, "expected a safe output stream!");
|
|
if (safeStream) {
|
|
rv = safeStream->Finish();
|
|
if (NS_FAILED(rv)) {
|
|
NS_WARNING("failed to save cert warn settings file! possible dataloss");
|
|
return rv;
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
static nsresult
|
|
GetCertFingerprintByOidTag(nsIX509Cert *aCert,
|
|
SECOidTag aOidTag,
|
|
nsCString &fp)
|
|
{
|
|
UniqueCERTCertificate nsscert(aCert->GetCert());
|
|
if (!nsscert) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
return GetCertFingerprintByOidTag(nsscert.get(), aOidTag, fp);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCertOverrideService::RememberValidityOverride(const nsACString& aHostName,
|
|
int32_t aPort,
|
|
nsIX509Cert* aCert,
|
|
uint32_t aOverrideBits,
|
|
bool aTemporary)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aCert);
|
|
if (aHostName.IsEmpty())
|
|
return NS_ERROR_INVALID_ARG;
|
|
if (aPort < -1)
|
|
return NS_ERROR_INVALID_ARG;
|
|
|
|
UniqueCERTCertificate nsscert(aCert->GetCert());
|
|
if (!nsscert) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsAutoCString nickname;
|
|
nsresult rv = DefaultServerNicknameForCert(nsscert.get(), nickname);
|
|
if (!aTemporary && NS_SUCCEEDED(rv)) {
|
|
UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
|
|
if (!slot) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
SECStatus srv = PK11_ImportCert(slot.get(), nsscert.get(), CK_INVALID_HANDLE,
|
|
nickname.get(), false);
|
|
if (srv != SECSuccess) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
|
|
nsAutoCString fpStr;
|
|
rv = GetCertFingerprintByOidTag(nsscert.get(), mOidTagForStoringNewHashes,
|
|
fpStr);
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
nsAutoCString dbkey;
|
|
rv = aCert->GetDbKey(dbkey);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
AddEntryToList(aHostName, aPort,
|
|
aTemporary ? aCert : nullptr,
|
|
// keep a reference to the cert for temporary overrides
|
|
aTemporary,
|
|
mDottedOidForStoringNewHashes, fpStr,
|
|
(nsCertOverride::OverrideBits)aOverrideBits,
|
|
dbkey);
|
|
Write();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCertOverrideService::HasMatchingOverride(const nsACString & aHostName, int32_t aPort,
|
|
nsIX509Cert *aCert,
|
|
uint32_t *aOverrideBits,
|
|
bool *aIsTemporary,
|
|
bool *_retval)
|
|
{
|
|
if (aHostName.IsEmpty())
|
|
return NS_ERROR_INVALID_ARG;
|
|
if (aPort < -1)
|
|
return NS_ERROR_INVALID_ARG;
|
|
|
|
NS_ENSURE_ARG_POINTER(aCert);
|
|
NS_ENSURE_ARG_POINTER(aOverrideBits);
|
|
NS_ENSURE_ARG_POINTER(aIsTemporary);
|
|
NS_ENSURE_ARG_POINTER(_retval);
|
|
*_retval = false;
|
|
*aOverrideBits = nsCertOverride::ob_None;
|
|
|
|
nsAutoCString hostPort;
|
|
GetHostWithPort(aHostName, aPort, hostPort);
|
|
nsCertOverride settings;
|
|
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
nsCertOverrideEntry *entry = mSettingsTable.GetEntry(hostPort.get());
|
|
|
|
if (!entry)
|
|
return NS_OK;
|
|
|
|
settings = entry->mSettings; // copy
|
|
}
|
|
|
|
*aOverrideBits = settings.mOverrideBits;
|
|
*aIsTemporary = settings.mIsTemporary;
|
|
|
|
nsAutoCString fpStr;
|
|
nsresult rv;
|
|
|
|
// This code was originally written in a way that suggested that other hash
|
|
// algorithms are supported for backwards compatibility. However, this was
|
|
// always unnecessary, because only SHA256 has ever been used here.
|
|
if (settings.mFingerprintAlgOID.Equals(mDottedOidForStoringNewHashes)) {
|
|
rv = GetCertFingerprintByOidTag(aCert, mOidTagForStoringNewHashes, fpStr);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
} else {
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
|
|
*_retval = settings.mFingerprint.Equals(fpStr);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCertOverrideService::GetValidityOverride(const nsACString & aHostName, int32_t aPort,
|
|
nsACString & aHashAlg,
|
|
nsACString & aFingerprint,
|
|
uint32_t *aOverrideBits,
|
|
bool *aIsTemporary,
|
|
bool *_found)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(_found);
|
|
NS_ENSURE_ARG_POINTER(aIsTemporary);
|
|
NS_ENSURE_ARG_POINTER(aOverrideBits);
|
|
*_found = false;
|
|
*aOverrideBits = nsCertOverride::ob_None;
|
|
|
|
nsAutoCString hostPort;
|
|
GetHostWithPort(aHostName, aPort, hostPort);
|
|
nsCertOverride settings;
|
|
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
nsCertOverrideEntry *entry = mSettingsTable.GetEntry(hostPort.get());
|
|
|
|
if (entry) {
|
|
*_found = true;
|
|
settings = entry->mSettings; // copy
|
|
}
|
|
}
|
|
|
|
if (*_found) {
|
|
*aOverrideBits = settings.mOverrideBits;
|
|
*aIsTemporary = settings.mIsTemporary;
|
|
aFingerprint = settings.mFingerprint;
|
|
aHashAlg = settings.mFingerprintAlgOID;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsCertOverrideService::AddEntryToList(const nsACString &aHostName, int32_t aPort,
|
|
nsIX509Cert *aCert,
|
|
const bool aIsTemporary,
|
|
const nsACString &fingerprintAlgOID,
|
|
const nsACString &fingerprint,
|
|
nsCertOverride::OverrideBits ob,
|
|
const nsACString &dbKey)
|
|
{
|
|
nsAutoCString hostPort;
|
|
GetHostWithPort(aHostName, aPort, hostPort);
|
|
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
nsCertOverrideEntry *entry = mSettingsTable.PutEntry(hostPort.get());
|
|
|
|
if (!entry) {
|
|
NS_ERROR("can't insert a null entry!");
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
entry->mHostWithPort = hostPort;
|
|
|
|
nsCertOverride &settings = entry->mSettings;
|
|
settings.mAsciiHost = aHostName;
|
|
settings.mPort = aPort;
|
|
settings.mIsTemporary = aIsTemporary;
|
|
settings.mFingerprintAlgOID = fingerprintAlgOID;
|
|
settings.mFingerprint = fingerprint;
|
|
settings.mOverrideBits = ob;
|
|
settings.mDBKey = dbKey;
|
|
// remove whitespace from stored dbKey for backwards compatibility
|
|
settings.mDBKey.StripWhitespace();
|
|
settings.mCert = aCert;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCertOverrideService::ClearValidityOverride(const nsACString & aHostName, int32_t aPort)
|
|
{
|
|
if (aPort == 0 &&
|
|
aHostName.EqualsLiteral("all:temporary-certificates")) {
|
|
RemoveAllTemporaryOverrides();
|
|
return NS_OK;
|
|
}
|
|
nsAutoCString hostPort;
|
|
GetHostWithPort(aHostName, aPort, hostPort);
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
mSettingsTable.RemoveEntry(hostPort.get());
|
|
Write();
|
|
}
|
|
|
|
if (EnsureNSSInitialized(nssEnsure)) {
|
|
SSL_ClearSessionCache();
|
|
} else {
|
|
return NS_ERROR_NOT_AVAILABLE;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
static bool
|
|
matchesDBKey(nsIX509Cert* cert, const nsCString& matchDbKey)
|
|
{
|
|
nsAutoCString dbKey;
|
|
nsresult rv = cert->GetDbKey(dbKey);
|
|
if (NS_FAILED(rv)) {
|
|
return false;
|
|
}
|
|
return dbKey.Equals(matchDbKey);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCertOverrideService::IsCertUsedForOverrides(nsIX509Cert *aCert,
|
|
bool aCheckTemporaries,
|
|
bool aCheckPermanents,
|
|
uint32_t *_retval)
|
|
{
|
|
NS_ENSURE_ARG(aCert);
|
|
NS_ENSURE_ARG(_retval);
|
|
|
|
uint32_t counter = 0;
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
for (auto iter = mSettingsTable.Iter(); !iter.Done(); iter.Next()) {
|
|
const nsCertOverride &settings = iter.Get()->mSettings;
|
|
bool still_ok = true;
|
|
|
|
if (( settings.mIsTemporary && !aCheckTemporaries) ||
|
|
(!settings.mIsTemporary && !aCheckPermanents)) {
|
|
still_ok = false;
|
|
}
|
|
|
|
if (still_ok && matchesDBKey(aCert, settings.mDBKey)) {
|
|
nsAutoCString cert_fingerprint;
|
|
nsresult rv = NS_ERROR_UNEXPECTED;
|
|
if (settings.mFingerprintAlgOID.Equals(mDottedOidForStoringNewHashes)) {
|
|
rv = GetCertFingerprintByOidTag(aCert,
|
|
mOidTagForStoringNewHashes, cert_fingerprint);
|
|
}
|
|
if (NS_SUCCEEDED(rv) &&
|
|
settings.mFingerprint.Equals(cert_fingerprint)) {
|
|
counter++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
*_retval = counter;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsCertOverrideService::EnumerateCertOverrides(nsIX509Cert *aCert,
|
|
CertOverrideEnumerator aEnumerator,
|
|
void *aUserData)
|
|
{
|
|
ReentrantMonitorAutoEnter lock(monitor);
|
|
for (auto iter = mSettingsTable.Iter(); !iter.Done(); iter.Next()) {
|
|
const nsCertOverride &settings = iter.Get()->mSettings;
|
|
|
|
if (!aCert) {
|
|
aEnumerator(settings, aUserData);
|
|
} else {
|
|
if (matchesDBKey(aCert, settings.mDBKey)) {
|
|
nsAutoCString cert_fingerprint;
|
|
nsresult rv = NS_ERROR_UNEXPECTED;
|
|
if (settings.mFingerprintAlgOID.Equals(mDottedOidForStoringNewHashes)) {
|
|
rv = GetCertFingerprintByOidTag(aCert,
|
|
mOidTagForStoringNewHashes, cert_fingerprint);
|
|
}
|
|
if (NS_SUCCEEDED(rv) &&
|
|
settings.mFingerprint.Equals(cert_fingerprint)) {
|
|
aEnumerator(settings, aUserData);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
nsCertOverrideService::GetHostWithPort(const nsACString & aHostName, int32_t aPort, nsACString& _retval)
|
|
{
|
|
nsAutoCString hostPort(aHostName);
|
|
if (aPort == -1) {
|
|
aPort = 443;
|
|
}
|
|
if (!hostPort.IsEmpty()) {
|
|
hostPort.Append(':');
|
|
hostPort.AppendInt(aPort);
|
|
}
|
|
_retval.Assign(hostPort);
|
|
}
|