Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ services:
- REDIS_HOST=0.0.0.0
- REDIS_PORT=6379
- REPORT_TOKEN=report-token-1
- REMOTE_MANAGEMENT_DISABLE=1
- HEALTHCHECKS_ALLOWFROM=0.0.0.0/0
- DATA_HOST=0.0.0.0
- METADATA_HOST=0.0.0.0
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ env:
# Configs
ENABLE_LOCAL_CACHE: 'true'
REPORT_TOKEN: 'report-token-1'
REMOTE_MANAGEMENT_DISABLE: '1'
# https://github.com/git-lfs/git-lfs/issues/5749
GIT_CLONE_PROTECTION_ACTIVE: 'false'
AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE: '1'
Expand Down
1 change: 0 additions & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ yarn lint_md # Markdown linting
- `mdserver.js` → Metadata server (port 9990)
- `dataserver.js` → Data storage server (port 9991)
- `pfsserver.js` → Passthrough filesystem server (port 9992)
- `managementAgent.js` → WebSocket management agent (port 8010)

### Core Components

Expand Down
39 changes: 0 additions & 39 deletions bin/secure_channel_proxy.js

This file was deleted.

2 changes: 0 additions & 2 deletions constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,6 @@ const constants = {
productName: 'APN/1.0 Scality/1.0 Scality CloudServer for Zenko',
// location constraint delimiter
zenkoSeparator: ':',
// user metadata applied on zenko objects
zenkoIDHeader: 'x-amz-meta-zenko-instance-id',
bucketOwnerActions: [
'bucketDeleteCors',
'bucketDeleteLifecycle',
Expand Down
11 changes: 0 additions & 11 deletions docs/DOCKER.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,6 @@ new.host.com, for example, specify the endpoint with:
.. note:: On Unix-like systems (Linux, OS X, etc.) edit /etc/hosts
to associate 127.0.0.1 with new.host.com.

REMOTE_MANAGEMENT_DISABLE
~~~~~~~~~~~~~~~~~~~~~~~~~

CloudServer is a part of `Zenko <https://www.zenko.io/>`__. When you run CloudServer standalone it will still try to connect to Orbit by default (browser-based graphical user interface for Zenko).

Setting this variable to true(1) will default to accessKey1 and verySecretKey1 for credentials and disable the automatic Orbit management:

.. code-block:: shell

$ docker run -d --name cloudserver -p 8000:8000 -e REMOTE_MANAGEMENT_DISABLE=1 zenko/cloudserver

SCALITY\_ACCESS\_KEY\_ID and SCALITY\_SECRET\_ACCESS\_KEY
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
30 changes: 0 additions & 30 deletions lib/Config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ const { EventEmitter } = require('events');
const fs = require('fs');
const path = require('path');
const url = require('url');
const crypto = require('crypto');

const { v4: uuidv4 } = require('uuid');
const cronParser = require('cron-parser');
Expand Down Expand Up @@ -1738,27 +1737,6 @@ class Config extends EventEmitter {
this.outboundProxy.certs = certObj.certs;
}

this.managementAgent = {};
this.managementAgent.port = 8010;
this.managementAgent.host = 'localhost';
if (config.managementAgent !== undefined) {
if (config.managementAgent.port !== undefined) {
assert(
Number.isInteger(config.managementAgent.port) && config.managementAgent.port > 0,
'bad config: managementAgent port must be a positive integer',
);
this.managementAgent.port = config.managementAgent.port;
}
if (config.managementAgent.host !== undefined) {
assert.strictEqual(
typeof config.managementAgent.host,
'string',
'bad config: management agent host must be a string',
);
this.managementAgent.host = config.managementAgent.host;
}
}

// Ephemeral token to protect the reporting endpoint:
Comment thread
francoisferrand marked this conversation as resolved.
// try inherited from parent first, then hardcoded in conf file,
// then create a fresh one as last resort.
Expand Down Expand Up @@ -2222,14 +2200,6 @@ class Config extends EventEmitter {
return this.locationConstraints[locationConstraint].details.serverSideEncryption === true;
}

getPublicInstanceId() {
return this.publicInstanceId;
}

setPublicInstanceId(instanceId) {
this.publicInstanceId = crypto.createHash('sha256').update(instanceId).digest('hex');
}

isQuotaEnabled() {
return !!this.quotaEnabled;
}
Expand Down
18 changes: 0 additions & 18 deletions lib/api/apiUtils/object/applyZenkoUserMD.js

This file was deleted.

4 changes: 0 additions & 4 deletions lib/api/apiUtils/object/createAndStoreObject.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const removeAWSChunked = require('./removeAWSChunked');
const getReplicationInfo = require('./getReplicationInfo');
const { config } = require('../../../Config');
const validateWebsiteHeader = require('./websiteServing').validateWebsiteHeader;
const applyZenkoUserMD = require('./applyZenkoUserMD');
const { isColdStorageClass } = require('./storageClass');
const {
algorithms,
Expand Down Expand Up @@ -158,9 +157,6 @@ function createAndStoreObject(
});
return process.nextTick(() => callback(metaHeaders));
}
// if the request occurs within a Zenko deployment, we place a user-metadata
// field on the object
applyZenkoUserMD(metaHeaders);

log.trace('meta headers', { metaHeaders, method: 'objectPut' });
const objectKeyContext = {
Expand Down
4 changes: 0 additions & 4 deletions lib/api/initiateMultipartUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const locationConstraintCheck = require('./apiUtils/object/locationConstraintChe
const validateWebsiteHeader = require('./apiUtils/object/websiteServing').validateWebsiteHeader;
const monitoring = require('../utilities/monitoringHandler');
const { data } = require('../data/wrapper');
const applyZenkoUserMD = require('./apiUtils/object/applyZenkoUserMD');
const { validateStorageClass } = require('./apiUtils/object/storageClass');
const { validateHeaders, compareObjectLockInformation } = require('./apiUtils/object/objectLockHelpers');
const { getObjectSSEConfiguration } = require('./apiUtils/bucket/bucketEncryption');
Expand Down Expand Up @@ -102,9 +101,6 @@ function initiateMultipartUpload(authInfo, request, log, callback) {
});
return process.nextTick(() => callback(metaHeaders));
}
// if the request occurs within a Zenko deployment, we place a user-metadata
// field on the object
applyZenkoUserMD(metaHeaders);

const storageClass = request.headers['x-amz-storage-class'] || 'STANDARD';
const metadataValParams = {
Expand Down
4 changes: 0 additions & 4 deletions lib/api/objectCopy.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const { standardMetadataValidateBucketAndObj } = require('../metadata/metadataUt
const validateWebsiteHeader = require('./apiUtils/object/websiteServing').validateWebsiteHeader;
const { config } = require('../Config');
const monitoring = require('../utilities/monitoringHandler');
const applyZenkoUserMD = require('./apiUtils/object/applyZenkoUserMD');
const { isColdStorageClass, validateStorageClass } = require('./apiUtils/object/storageClass');
const { getObjectSSEConfiguration } = require('./apiUtils/bucket/bucketEncryption');
const { setExpirationHeaders } = require('./apiUtils/object/expirationHeaders');
Expand Down Expand Up @@ -336,9 +335,6 @@ function _prepMetadata(
});
return { error: userMetadata };
}
// if the request occurs within a Zenko deployment, we place a user-metadata
// field on the object
applyZenkoUserMD(userMetadata);
// If metadataDirective is:
// - 'COPY' and source object has a location constraint in its metadata
// we use the bucket destination location constraint
Expand Down
32 changes: 0 additions & 32 deletions lib/management/ChannelMessageV0.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,38 +67,6 @@ class ChannelMessageV0 {
return this.payload;
}

/**
* Creates a wire representation of a channel close message
*
* @param {number} channelId Channel number
*
* @returns {Buffer} wire representation
*/
static encodeChannelCloseMessage(channelId) {
const buf = Buffer.alloc(headerSize);
buf.writeUInt8(MessageType.CHANNEL_CLOSE_MESSAGE, 0);
buf.writeUInt8(channelId, 1);
buf.writeUInt8(TargetType.TARGET_ANY, 2);
return buf;
}

/**
* Creates a wire representation of a channel data message
*
* @param {number} channelId Channel number
* @param {Buffer} data Payload
*
* @returns {Buffer} wire representation
*/
static encodeChannelDataMessage(channelId, data) {
const buf = Buffer.alloc(data.length + headerSize);
buf.writeUInt8(MessageType.CHANNEL_PAYLOAD_MESSAGE, 0);
buf.writeUInt8(channelId, 1);
buf.writeUInt8(TargetType.TARGET_ANY, 2);
data.copy(buf, headerSize);
return buf;
}

/**
* Creates a wire representation of a metrics message
*
Expand Down
91 changes: 0 additions & 91 deletions lib/management/agentClient.js

This file was deleted.

Loading
Loading