Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
2f2a3b2f
Commit
2f2a3b2f
authored
Sep 12, 2016
by
ilushka85
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reduce area of which semaphore is locked
parent
204c4da6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
42 additions
and
38 deletions
+42
-38
CertificateManager.cs
Titanium.Web.Proxy/Network/CertificateManager.cs
+42
-38
No files found.
Titanium.Web.Proxy/Network/CertificateManager.cs
View file @
2f2a3b2f
...
@@ -108,59 +108,62 @@ namespace Titanium.Web.Proxy.Network
...
@@ -108,59 +108,62 @@ namespace Titanium.Web.Proxy.Network
}
}
await
semaphoreLock
.
WaitAsync
();
try
{
X509Certificate2
certificate
=
null
;
store
.
Open
(
OpenFlags
.
ReadWrite
);
string
certificateSubject
=
string
.
Format
(
"CN={0}, O={1}"
,
certificateName
,
Issuer
);
X509Certificate2Collection
certificates
;
X509Certificate2
certificate
=
null
;
store
.
Open
(
OpenFlags
.
ReadWrite
);
string
certificateSubject
=
string
.
Format
(
"CN={0}, O={1}"
,
certificateName
,
Issuer
);
if
(
isRootCertificate
)
X509Certificate2Collection
certificates
;
{
certificates
=
FindCertificates
(
store
,
certificateSubject
);
if
(
certificates
!=
null
)
if
(
isRootCertificate
)
{
{
certificate
=
certificates
[
0
];
certificates
=
FindCertificates
(
store
,
certificateSubject
);
}
}
if
(
certificate
=
=
null
)
if
(
certificate
s
!
=
null
)
{
{
string
[]
args
=
new
[]
{
certificate
=
certificates
[
0
];
}
}
if
(
certificate
==
null
)
{
string
[]
args
=
new
[]
{
GetCertificateCreateArgs
(
store
,
certificateName
)
};
GetCertificateCreateArgs
(
store
,
certificateName
)
};
await
semaphoreLock
.
WaitAsync
();
try
{
await
CreateCertificate
(
args
);
await
CreateCertificate
(
args
);
certificates
=
FindCertificates
(
store
,
certificateSubject
);
//remove it from store
if
(!
isRootCertificate
)
{
DestroyCertificate
(
certificateName
);
}
if
(
certificates
!=
null
)
{
certificate
=
certificates
[
0
];
}
}
}
finally
{
semaphoreLock
.
Release
();
}
certificates
=
FindCertificates
(
store
,
certificateSubject
);
store
.
Close
();
//remove it from store
if
(!
isRootCertificate
)
if
(
certificate
!=
null
&&
!
certificateCache
.
ContainsKey
(
certificateName
))
{
{
certificateCache
.
Add
(
certificateName
,
new
CachedCertificate
()
{
Certificate
=
certificate
}
);
DestroyCertificate
(
certificateName
);
}
}
return
certificate
;
if
(
certificates
!=
null
)
{
certificate
=
certificates
[
0
];
}
}
}
finally
store
.
Close
();
if
(
certificate
!=
null
&&
!
certificateCache
.
ContainsKey
(
certificateName
))
{
{
semaphoreLock
.
Release
(
);
certificateCache
.
Add
(
certificateName
,
new
CachedCertificate
()
{
Certificate
=
certificate
}
);
}
}
return
certificate
;
}
}
/// <summary>
/// <summary>
...
@@ -270,7 +273,7 @@ namespace Titanium.Web.Proxy.Network
...
@@ -270,7 +273,7 @@ namespace Titanium.Web.Proxy.Network
return
certCreatArgs
;
return
certCreatArgs
;
}
}
private
bool
clearCertificates
{
get
;
set
;
}
private
bool
clearCertificates
{
get
;
set
;
}
/// <summary>
/// <summary>
/// Stops the certificate cache clear process
/// Stops the certificate cache clear process
...
@@ -301,7 +304,8 @@ namespace Titanium.Web.Proxy.Network
...
@@ -301,7 +304,8 @@ namespace Titanium.Web.Proxy.Network
foreach
(
var
cache
in
outdated
)
foreach
(
var
cache
in
outdated
)
certificateCache
.
Remove
(
cache
.
Key
);
certificateCache
.
Remove
(
cache
.
Key
);
}
}
finally
{
finally
{
semaphoreLock
.
Release
();
semaphoreLock
.
Release
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment