Page MenuHomePhabricator
Files F14021480

D15856.diff
No OneTemporary
Actions

D15856.diff
View Options

diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -267,20 +267,27 @@
// token from SSH. If they're using HTTP username + password auth, they
// have to obey the normal HTTP rules.
} else {
- if ($request->isHTTPS()) {
- $protocol = PhabricatorRepositoryURI::BUILTIN_PROTOCOL_HTTPS;
- } else {
- $protocol = PhabricatorRepositoryURI::BUILTIN_PROTOCOL_HTTP;
- }
-
- if (!$repository->canServeProtocol($protocol, false)) {
+ // For now, we don't distinguish between HTTP and HTTPS-originated
+ // requests that are proxied within the cluster, so the user can connect
+ // with HTTPS but we may be on HTTP by the time we reach this part of
+ // the code. Allow things to move forward as long as either protocol
+ // can be served.
+ $proto_https = PhabricatorRepositoryURI::BUILTIN_PROTOCOL_HTTPS;
+ $proto_http = PhabricatorRepositoryURI::BUILTIN_PROTOCOL_HTTP;
+
+ $can_read =
+ $repository->canServeProtocol($proto_https, false) ||
+ $repository->canServeProtocol($proto_http, false);
+ if (!$can_read) {
return new PhabricatorVCSResponse(
403,
pht('This repository is not available over HTTP.'));
}
if ($is_push) {
- $can_write = $repository->canServeProtocol($protocol, true);
+ $can_write =
+ $repository->canServeProtocol($proto_https, true) ||
+ $repository->canServeProtocol($proto_http, true);
if (!$can_write) {
return new PhabricatorVCSResponse(
403,

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 7, 9:13 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6736628
Default Alt Text
D15856.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility