Publishing is currently disabled.
-{message}
+
+
);
}
diff --git a/client/src/utils/metaTags.js b/client/src/utils/metaTags.js
index cd11b853..c5b9df34 100644
--- a/client/src/utils/metaTags.js
+++ b/client/src/utils/metaTags.js
@@ -46,9 +46,9 @@ const createChannelMetaTags = ({siteHost, siteTitle, siteTwitter, channel}) => {
const createAssetMetaTags = ({siteHost, siteTitle, siteTwitter, asset, defaultDescription, defaultThumbnail}) => {
const { claimData } = asset;
const { contentType } = claimData;
- const embedUrl = `${siteHost}/${claimData.claimId}/${claimData.name}`;
+ const videoEmbedUrl = `${siteHost}/video-embed/${claimData.name}/${claimData.claimId}`;
const showUrl = `${siteHost}/${claimData.claimId}/${claimData.name}`;
- const source = `${siteHost}/${claimData.claimId}/${claimData.name}.${claimData.fileExt}`;
+ const source = `${siteHost}/asset/${claimData.name}/${claimData.claimId}`;
const ogTitle = claimData.title || claimData.name;
const ogDescription = claimData.description || defaultDescription;
const ogThumbnailContentType = determineOgThumbnailContentType(claimData.thumbnail);
@@ -68,9 +68,9 @@ const createAssetMetaTags = ({siteHost, siteTitle, siteTwitter, asset, defaultDe
metaTags.push({property: 'og:video:type', content: contentType});
metaTags.push({property: 'og:image', content: ogThumbnail});
metaTags.push({property: 'og:image:type', content: ogThumbnailContentType});
- metaTags.push({property: 'og:type', content: 'video'});
+ metaTags.push({property: 'og:type', content: 'video.other'});
metaTags.push({property: 'twitter:card', content: 'player'});
- metaTags.push({property: 'twitter:player', content: embedUrl});
+ metaTags.push({property: 'twitter:player', content: videoEmbedUrl});
metaTags.push({property: 'twitter:player:width', content: 600});
metaTags.push({property: 'twitter:text:player_width', content: 600});
metaTags.push({property: 'twitter:player:height', content: 337});
diff --git a/index.js b/index.js
index fb4e362e..be30317c 100644
--- a/index.js
+++ b/index.js
@@ -35,6 +35,10 @@ const speechPassport = require('./server/speechPassport');
const {
details: { port: PORT },
auth: { sessionKey },
+ startup: {
+ performChecks,
+ performUpdates,
+ },
} = require('@config/siteConfig');
function Server () {
@@ -97,31 +101,70 @@ function Server () {
/* create server */
this.server = http.Server(this.app);
};
+ this.startServerListening = () => {
+ logger.info(`Starting server on ${PORT}...`);
+ return new Promise((resolve, reject) => {
+ this.server.listen(PORT, () => {
+ logger.info(`Server is listening on PORT ${PORT}`);
+ resolve();
+ })
+ });
+ };
this.syncDatabase = () => {
+ logger.info(`Syncing database...`);
return createDatabaseIfNotExists()
.then(() => {
db.sequelize.sync();
})
};
+ this.performChecks = () => {
+ if (!performChecks) {
+ return;
+ }
+ logger.info(`Performing checks...`);
+ return Promise.all([
+ getWalletBalance(),
+ ])
+ .then(([walletBalance]) => {
+ logger.info('Starting LBC balance:', walletBalance);
+ })
+ };
+ this.performUpdates = () => {
+ if (!performUpdates) {
+ return;
+ }
+ logger.info(`Peforming updates...`);
+ return Promise.all([
+ db.Blocked.refreshTable(),
+ db.Tor.refreshTable(),
+ ])
+ .then(([updatedBlockedList, updatedTorList]) => {
+ logger.info('Blocked list updated, length:', updatedBlockedList.length);
+ logger.info('Tor list updated, length:', updatedTorList.length);
+ })
+ };
this.start = () => {
this.initialize();
this.createApp();
this.createServer();
- /* start the server */
- logger.info('getting LBC balance & syncing database...');
- Promise.all([
- this.syncDatabase(),
- getWalletBalance(),
- ])
- .then(([syncResult, walletBalance]) => {
- logger.info('starting LBC balance:', walletBalance);
- return this.server.listen(PORT, () => {
- logger.info(`Server is listening on PORT ${PORT}`);
- })
+ this.syncDatabase()
+ .then(() => {
+ return this.startServerListening();
+ })
+ .then(() => {
+ return Promise.all([
+ this.performChecks(),
+ this.performUpdates(),
+ ])
+ })
+ .then(() => {
+ logger.info('Spee.ch startup is complete');
})
.catch(error => {
if (error.code === 'ECONNREFUSED') {
return logger.error('Connection refused. The daemon may not be running.')
+ } else if (error.code === 'EADDRINUSE') {
+ return logger.error('Server could not start listening. The port is already in use.');
} else if (error.message) {
logger.error(error.message);
}
diff --git a/server/controllers/api/blocked/index.js b/server/controllers/api/blocked/index.js
new file mode 100644
index 00000000..aad2dfc2
--- /dev/null
+++ b/server/controllers/api/blocked/index.js
@@ -0,0 +1,22 @@
+const logger = require('winston');
+const db = require('../../../models');
+
+const updateBlockedList = (req, res) => {
+ db.Blocked.refreshTable()
+ .then(data => {
+ logger.info('finished updating blocked content list');
+ res.status(200).json({
+ success: true,
+ data,
+ });
+ })
+ .catch(error => {
+ logger.error(error);
+ res.status(500).json({
+ success: false,
+ error,
+ });
+ });
+};
+
+module.exports = updateBlockedList;
diff --git a/server/controllers/api/claim/blockedList/index.js b/server/controllers/api/claim/blockedList/index.js
deleted file mode 100644
index abc80d8e..00000000
--- a/server/controllers/api/claim/blockedList/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const logger = require('winston');
-const db = require('../../../../models');
-
-const updateBlockedList = (req, res) => {
- return fetch('https://api.lbry.io/file/list_blocked')
- .then(response => {
- return response.json();
- })
- .then(jsonResponse => {
- if (!jsonResponse.data) {
- throw new Error('no data in list_blocked response');
- }
- if (!jsonResponse.data.outpoints) {
- throw new Error('no outpoints in list_blocked response');
- }
- return jsonResponse.data.outpoints;
- })
- .then(outpoints => {
- logger.info('number of blocked outpoints:', outpoints.length);
- let updatePromises = [];
- outpoints.forEach(outpoint => {
- // logger.debug('outpoint:', outpoint);
- updatePromises.push(db.Claim
- .findOne({
- where: {
- outpoint,
- },
- })
- .then(Claim => {
- if (Claim) {
- const { claimId, name } = Claim;
- logger.debug(`creating record in Blocked for ${name}#${claimId}`);
- const blocked = {
- claimId,
- name,
- outpoint,
- };
- return db.upsert(db.Blocked, blocked, blocked, 'Blocked')
- }
- })
- .catch(error => {
- logger.error(error);
- }));
- });
- return Promise.all(updatePromises);
- })
- .then(() => {
- logger.info('finished updating blocked content list');
- res.status(200).json({success: true, message: 'finished updating blocked content list'});
- })
- .catch((error) => {
- logger.error(error);
- });
-};
-
-module.exports = updateBlockedList;
diff --git a/server/controllers/api/claim/longId/index.js b/server/controllers/api/claim/longId/index.js
index 0eb3668c..27f66b1c 100644
--- a/server/controllers/api/claim/longId/index.js
+++ b/server/controllers/api/claim/longId/index.js
@@ -22,7 +22,10 @@ const claimLongId = ({ ip, originalUrl, body, params }, res) => {
getClaimId(channelName, channelClaimId, claimName, claimId)
.then(fullClaimId => {
claimId = fullClaimId;
- return db.Blocked.isNotBlocked(fullClaimId, claimName);
+ return db.Claim.getOutpoint(claimName, fullClaimId);
+ })
+ .then(outpoint => {
+ return db.Blocked.isNotBlocked(outpoint);
})
.then(() => {
res.status(200).json({success: true, data: claimId});
diff --git a/server/controllers/api/claim/publish/index.js b/server/controllers/api/claim/publish/index.js
index 15e48ee9..b429e797 100644
--- a/server/controllers/api/claim/publish/index.js
+++ b/server/controllers/api/claim/publish/index.js
@@ -1,4 +1,6 @@
-const { details: { host } } = require('@config/siteConfig');
+const logger = require('winston');
+
+const { details: { host }, publishing: { disabled, disabledMessage } } = require('@config/siteConfig');
const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
@@ -19,7 +21,20 @@ const authenticateUser = require('./authentication.js');
*/
-const claimPublish = ({ body, files, headers, ip, originalUrl, user }, res) => {
+const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res) => {
+ // logging
+ logger.info('Publish request:', {
+ ip,
+ headers,
+ body,
+ });
+ // check for disabled publishing
+ if (disabled) {
+ return res.status(503).json({
+ success: false,
+ message: disabledMessage
+ });
+ }
// define variables
let channelName, channelId, channelPassword, description, fileName, filePath, fileType, gaStartTime, license, name, nsfw, thumbnail, thumbnailFileName, thumbnailFilePath, thumbnailFileType, title;
// record the start time of the request
diff --git a/server/controllers/api/config/site/publishing/index.js b/server/controllers/api/config/site/publishing/index.js
new file mode 100644
index 00000000..08e60bf3
--- /dev/null
+++ b/server/controllers/api/config/site/publishing/index.js
@@ -0,0 +1,29 @@
+const { publishing: {
+ primaryClaimAddress,
+ uploadDirectory,
+ thumbnailChannel,
+ thumbnailChannelId,
+ additionalClaimAddresses,
+ disabled,
+ disabledMessage
+} } = require('@config/siteConfig');
+
+/*
+
+ route to see if publishing is enabled
+
+*/
+
+const publishingConfig = (req, res) => {
+ return res.status(200).json({
+ primaryClaimAddress,
+ uploadDirectory,
+ thumbnailChannel,
+ thumbnailChannelId,
+ additionalClaimAddresses,
+ disabled,
+ disabledMessage
+ });
+};
+
+module.exports = publishingConfig;
diff --git a/server/controllers/api/tor/index.js b/server/controllers/api/tor/index.js
new file mode 100644
index 00000000..df4c5831
--- /dev/null
+++ b/server/controllers/api/tor/index.js
@@ -0,0 +1,25 @@
+const logger = require('winston');
+const db = require('../../../models');
+
+/*
+
+ Route to update and return tor exit nodes that can connect to this ip address
+
+*/
+
+const getTorList = (req, res) => {
+ db.Tor.refreshTable()
+ .then( result => {
+ logger.debug('number of records', result.length);
+ res.status(200).json(result);
+ })
+ .catch((error) => {
+ logger.error(error);
+ res.status(500).json({
+ success: false,
+ error,
+ })
+ });
+};
+
+module.exports = getTorList;
diff --git a/server/controllers/assets/constants/request_types.js b/server/controllers/assets/constants/request_types.js
new file mode 100644
index 00000000..22f0d0ce
--- /dev/null
+++ b/server/controllers/assets/constants/request_types.js
@@ -0,0 +1,9 @@
+const EMBED = 'EMBED';
+const BROWSER = 'BROWSER';
+const SOCIAL = 'SOCIAL';
+
+module.exports = {
+ EMBED,
+ BROWSER,
+ SOCIAL,
+};
diff --git a/server/controllers/assets/serveAsset/index.js b/server/controllers/assets/serveAsset/index.js
new file mode 100644
index 00000000..3f0149a8
--- /dev/null
+++ b/server/controllers/assets/serveAsset/index.js
@@ -0,0 +1,17 @@
+const { sendGAServeEvent } = require('../../../utils/googleAnalytics');
+const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js');
+
+/*
+
+ route to serve an asset directly
+
+*/
+
+const serveAsset = ({ headers, ip, originalUrl, params: { claimName, claimId } }, res) => {
+ // send google analytics
+ sendGAServeEvent(headers, ip, originalUrl);
+ // get the claim Id and then serve the asset
+ getClaimIdAndServeAsset(null, null, claimName, claimId, originalUrl, ip, res);
+};
+
+module.exports = serveAsset;
diff --git a/server/controllers/assets/serveByClaim/index.js b/server/controllers/assets/serveByClaim/index.js
index a561754e..6e0e9e40 100644
--- a/server/controllers/assets/serveByClaim/index.js
+++ b/server/controllers/assets/serveByClaim/index.js
@@ -3,11 +3,10 @@ const handleShowRender = require('../../../render/build/handleShowRender.js');
const lbryUri = require('../utils/lbryUri.js');
-const determineResponseType = require('../utils/determineResponseType.js');
+const determineRequestType = require('../utils/determineRequestType.js');
const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js');
-const logRequestData = require('../utils/logRequestData.js');
-const SERVE = 'SERVE';
+const { EMBED } = require('../constants/request_types.js');
/*
@@ -15,7 +14,7 @@ const SERVE = 'SERVE';
*/
-const serverAssetByClaim = (req, res) => {
+const serveByClaim = (req, res) => {
const { headers, ip, originalUrl, params } = req;
// decide if this is a show request
let hasFileExtension;
@@ -24,13 +23,11 @@ const serverAssetByClaim = (req, res) => {
} catch (error) {
return res.status(400).json({success: false, message: error.message});
}
- let responseType = determineResponseType(hasFileExtension, headers);
- if (responseType !== SERVE) {
+ // determine request type
+ let requestType = determineRequestType(hasFileExtension, headers);
+ if (requestType !== EMBED) {
return handleShowRender(req, res);
}
- // handle serve request
- // send google analytics
- sendGAServeEvent(headers, ip, originalUrl);
// parse the claim
let claimName;
try {
@@ -38,10 +35,10 @@ const serverAssetByClaim = (req, res) => {
} catch (error) {
return res.status(400).json({success: false, message: error.message});
}
- // log the request data for debugging
- logRequestData(responseType, claimName, null, null);
+ // send google analytics
+ sendGAServeEvent(headers, ip, originalUrl);
// get the claim Id and then serve the asset
getClaimIdAndServeAsset(null, null, claimName, null, originalUrl, ip, res);
};
-module.exports = serverAssetByClaim;
+module.exports = serveByClaim;
diff --git a/server/controllers/assets/serveByIdentifierAndClaim/index.js b/server/controllers/assets/serveByIdentifierAndClaim/index.js
index e493e01e..609a1256 100644
--- a/server/controllers/assets/serveByIdentifierAndClaim/index.js
+++ b/server/controllers/assets/serveByIdentifierAndClaim/index.js
@@ -3,12 +3,11 @@ const handleShowRender = require('../../../render/build/handleShowRender.js');
const lbryUri = require('../utils/lbryUri.js');
-const determineResponseType = require('../utils/determineResponseType.js');
+const determineRequestType = require('../utils/determineRequestType.js');
const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js');
const flipClaimNameAndId = require('../utils/flipClaimNameAndId.js');
-const logRequestData = require('../utils/logRequestData.js');
-const SERVE = 'SERVE';
+const { EMBED } = require('../constants/request_types.js');
/*
@@ -16,22 +15,20 @@ const SERVE = 'SERVE';
*/
-const serverAssetByIdentifierAndClaim = (req, res) => {
+const serverByIdentifierAndClaim = (req, res) => {
const { headers, ip, originalUrl, params } = req;
- // decide if this is a show request
+ // parse request
let hasFileExtension;
try {
({ hasFileExtension } = lbryUri.parseModifier(params.claim));
} catch (error) {
return res.status(400).json({success: false, message: error.message});
}
- let responseType = determineResponseType(hasFileExtension, headers);
- if (responseType !== SERVE) {
+ // determine request type
+ let requestType = determineRequestType(hasFileExtension, headers);
+ if (requestType !== EMBED) {
return handleShowRender(req, res);
}
- // handle serve request
- // send google analytics
- sendGAServeEvent(headers, ip, originalUrl);
// parse the claim
let claimName;
try {
@@ -50,10 +47,10 @@ const serverAssetByIdentifierAndClaim = (req, res) => {
if (!isChannel) {
[claimId, claimName] = flipClaimNameAndId(claimId, claimName);
}
- // log the request data for debugging
- logRequestData(responseType, claimName, channelName, claimId);
+ // send google analytics
+ sendGAServeEvent(headers, ip, originalUrl);
// get the claim Id and then serve the asset
getClaimIdAndServeAsset(channelName, channelClaimId, claimName, claimId, originalUrl, ip, res);
};
-module.exports = serverAssetByIdentifierAndClaim;
+module.exports = serverByIdentifierAndClaim;
diff --git a/server/controllers/assets/utils/determineRequestType.js b/server/controllers/assets/utils/determineRequestType.js
new file mode 100644
index 00000000..afc5574f
--- /dev/null
+++ b/server/controllers/assets/utils/determineRequestType.js
@@ -0,0 +1,60 @@
+const logger = require('winston');
+const { EMBED, BROWSER, SOCIAL } = require('../constants/request_types.js');
+
+function headersMatchesSocialBotList (headers) {
+ const userAgent = headers['user-agent'];
+ const socialBotList = [
+ 'facebookexternalhit',
+ 'Twitterbot',
+ ];
+ for (let i = 0; i < socialBotList.length; i++) {
+ if (userAgent.includes(socialBotList[i])) {
+ logger.debug('request is from social bot:', socialBotList[i]);
+ return true;
+ }
+ }
+ return false;
+}
+
+function clientAcceptsHtml ({accept}) {
+ return accept && accept.match(/text\/html/);
+}
+
+function requestIsFromBrowser (headers) {
+ return headers['user-agent'] && headers['user-agent'].match(/Mozilla/);
+}
+
+function clientWantsAsset ({accept, range}) {
+ const imageIsWanted = accept && accept.match(/image\/.*/) && !accept.match(/text\/html/) && !accept.match(/text\/\*/);
+ const videoIsWanted = accept && range;
+ return imageIsWanted || videoIsWanted;
+}
+
+const determineRequestType = (hasFileExtension, headers) => {
+ let responseType;
+ logger.debug('headers:', headers);
+ // return early with 'show' if headers match the list
+ if (headersMatchesSocialBotList(headers)) {
+ return SOCIAL;
+ }
+ // if request is not from a social bot...
+ if (hasFileExtension) {
+ // assume embed,
+ responseType = EMBED;
+ // but change to browser if client accepts html.
+ if (clientAcceptsHtml(headers)) {
+ responseType = BROWSER;
+ }
+ // if request does not have file extentsion...
+ } else {
+ // assume browser,
+ responseType = BROWSER;
+ // but change to embed if someone embeded a show url...
+ if (clientWantsAsset(headers) && requestIsFromBrowser(headers)) {
+ responseType = EMBED;
+ }
+ }
+ return responseType;
+};
+
+module.exports = determineRequestType;
diff --git a/server/controllers/assets/utils/determineResponseType.js b/server/controllers/assets/utils/determineResponseType.js
deleted file mode 100644
index f32a0c5c..00000000
--- a/server/controllers/assets/utils/determineResponseType.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const logger = require('winston');
-
-const SERVE = 'SERVE';
-const SHOW = 'SHOW';
-
-function clientAcceptsHtml ({accept}) {
- return accept && accept.match(/text\/html/);
-};
-
-function requestIsFromBrowser (headers) {
- return headers['user-agent'] && headers['user-agent'].match(/Mozilla/);
-};
-
-function clientWantsAsset ({accept, range}) {
- const imageIsWanted = accept && accept.match(/image\/.*/) && !accept.match(/text\/html/) && !accept.match(/text\/\*/);
- const videoIsWanted = accept && range;
- return imageIsWanted || videoIsWanted;
-};
-
-const determineResponseType = (hasFileExtension, headers) => {
- let responseType;
- if (hasFileExtension) {
- responseType = SERVE; // assume a serve request if file extension is present
- if (clientAcceptsHtml(headers)) { // if the request comes from a browser, change it to a show request
- responseType = SHOW;
- }
- } else {
- responseType = SHOW;
- if (clientWantsAsset(headers) && requestIsFromBrowser(headers)) { // this is in case someone embeds a show url
- logger.debug('Show request came from browser but wants an image/video. Changing response to serve...');
- responseType = SERVE;
- }
- }
- return responseType;
-};
-
-module.exports = determineResponseType;
diff --git a/server/controllers/assets/utils/getClaimIdAndServeAsset.js b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
index e391383d..6603d046 100644
--- a/server/controllers/assets/utils/getClaimIdAndServeAsset.js
+++ b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
@@ -17,7 +17,12 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
getClaimId(channelName, channelClaimId, claimName, claimId)
.then(fullClaimId => {
claimId = fullClaimId;
- return db.Blocked.isNotBlocked(fullClaimId, claimName);
+ logger.debug('Full claim id:', fullClaimId);
+ return db.Claim.getOutpoint(claimName, fullClaimId);
+ })
+ .then(outpoint => {
+ logger.debug('Outpoint:', outpoint);
+ return db.Blocked.isNotBlocked(outpoint);
})
.then(() => {
return getLocalFileRecord(claimId, claimName);
diff --git a/server/controllers/pages/sendEmbedPage.js b/server/controllers/pages/sendVideoEmbedPage.js
similarity index 73%
rename from server/controllers/pages/sendEmbedPage.js
rename to server/controllers/pages/sendVideoEmbedPage.js
index d4bef437..01f6b1f4 100644
--- a/server/controllers/pages/sendEmbedPage.js
+++ b/server/controllers/pages/sendVideoEmbedPage.js
@@ -1,10 +1,10 @@
const { details: { host } } = require('@config/siteConfig');
-const sendEmbedPage = ({ params }, res) => {
+const sendVideoEmbedPage = ({ params }, res) => {
const claimId = params.claimId;
const name = params.name;
// get and render the content
res.status(200).render('embed', { layout: 'embed', host, claimId, name });
};
-module.exports = sendEmbedPage;
+module.exports = sendVideoEmbedPage;
diff --git a/server/lbrynet/index.js b/server/lbrynet/index.js
index bab4ede0..4ff64521 100644
--- a/server/lbrynet/index.js
+++ b/server/lbrynet/index.js
@@ -1,6 +1,6 @@
const axios = require('axios');
const logger = require('winston');
-const { apiHost, apiPort } = require('@config/lbryConfig');
+const { apiHost, apiPort, getTimeout } = require('@config/lbryConfig');
const lbrynetUri = 'http://' + apiHost + ':' + apiPort;
const { chooseGaLbrynetPublishLabel, sendGATimingEvent } = require('../utils/googleAnalytics.js');
const handleLbrynetResponse = require('./utils/handleLbrynetResponse.js');
@@ -31,7 +31,10 @@ module.exports = {
axios
.post(lbrynetUri, {
method: 'get',
- params: { uri, timeout: 20 },
+ params: {
+ uri,
+ timeout: getTimeout || 30,
+ },
})
.then(response => {
sendGATimingEvent('lbrynet', 'getClaim', 'GET', gaStartTime, Date.now());
diff --git a/server/routes/utils/multipartMiddleware.js b/server/middleware/multipartMiddleware.js
similarity index 100%
rename from server/routes/utils/multipartMiddleware.js
rename to server/middleware/multipartMiddleware.js
diff --git a/server/middleware/torCheckMiddleware.js b/server/middleware/torCheckMiddleware.js
new file mode 100644
index 00000000..62c42af5
--- /dev/null
+++ b/server/middleware/torCheckMiddleware.js
@@ -0,0 +1,31 @@
+const logger = require('winston');
+const db = require('../models');
+
+const torCheck = (req, res, next) => {
+ const { ip } = req;
+ logger.debug(`tor check for: ${ip}`);
+ return db.Tor.findAll(
+ {
+ where: {
+ address: ip,
+ },
+ raw: true,
+ })
+ .then(result => {
+ if (result.length >= 1) {
+ logger.info('Tor request blocked:', ip);
+ const failureResponse = {
+ success: false,
+ message: 'Unfortunately this api route is not currently available for tor users. We are working on a solution that will allow tor users to use this endpoint in the future.',
+ };
+ res.status(403).json(failureResponse);
+ } else {
+ return next();
+ }
+ })
+ .catch(error => {
+ logger.error(error);
+ });
+};
+
+module.exports = torCheck;
diff --git a/server/models/blocked.js b/server/models/blocked.js
index 12a04ca9..5e413889 100644
--- a/server/models/blocked.js
+++ b/server/models/blocked.js
@@ -6,14 +6,6 @@ module.exports = (sequelize, { STRING }) => {
const Blocked = sequelize.define(
'Blocked',
{
- claimId: {
- type : STRING,
- allowNull: false,
- },
- name: {
- type : STRING,
- allowNull: false,
- },
outpoint: {
type : STRING,
allowNull: false,
@@ -24,13 +16,12 @@ module.exports = (sequelize, { STRING }) => {
}
);
- Blocked.isNotBlocked = function (claimId, name) {
- logger.debug(`checking to see if ${name}#${claimId} is not blocked`);
+ Blocked.isNotBlocked = function (outpoint) {
+ logger.debug(`checking to see if ${outpoint} is not blocked`);
return new Promise((resolve, reject) => {
this.findOne({
where: {
- claimId,
- name,
+ outpoint,
},
})
.then(result => {
@@ -46,5 +37,39 @@ module.exports = (sequelize, { STRING }) => {
});
};
+ Blocked.refreshTable = function () {
+ let blockedList = [];
+ return fetch('https://api.lbry.io/file/list_blocked')
+ .then(response => {
+ return response.json();
+ })
+ .then(jsonResponse => {
+ if (!jsonResponse.data) {
+ throw new Error('no data in list_blocked response');
+ }
+ if (!jsonResponse.data.outpoints) {
+ throw new Error('no outpoints in list_blocked response');
+ }
+ return jsonResponse.data.outpoints;
+ })
+ .then(outpoints => {
+ logger.debug('total outpoints:', outpoints.length);
+ // prep the records
+ for (let i = 0; i < outpoints.length; i++) {
+ blockedList.push({
+ outpoint: outpoints[i],
+ });
+ }
+ // clear the table
+ return this.destroy({
+ truncate: true,
+ });
+ })
+ .then(() => {
+ // fill the table
+ return this.bulkCreate(blockedList);
+ });
+ };
+
return Blocked;
};
diff --git a/server/models/claim.js b/server/models/claim.js
index 128d76ee..7e2a5f61 100644
--- a/server/models/claim.js
+++ b/server/models/claim.js
@@ -378,5 +378,27 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
});
};
+ Claim.getOutpoint = function (name, claimId) {
+ return this
+ .findAll({
+ where : { name, claimId },
+ attributes: ['outpoint'],
+ })
+ .then(result => {
+ logger.debug('outpoint result');
+ switch (result.length) {
+ case 0:
+ throw new Error(`no record found for ${name}#${claimId}`);
+ case 1:
+ return result[0].dataValues.outpoint;
+ default:
+ throw new Error(`more than one record found for ${name}#${claimId}`);
+ }
+ })
+ .catch(error => {
+ throw error;
+ });
+ };
+
return Claim;
};
diff --git a/server/models/index.js b/server/models/index.js
index e2011bc8..a13d58ec 100644
--- a/server/models/index.js
+++ b/server/models/index.js
@@ -8,6 +8,7 @@ const File = require('./file.js');
const Request = require('./request.js');
const User = require('./user.js');
const Blocked = require('./blocked.js');
+const Tor = require('./tor.js');
const {database, username, password} = require('@config/mysqlConfig');
if (!database || !username || !password) {
@@ -50,6 +51,7 @@ db['File'] = sequelize.import('File', File);
db['Request'] = sequelize.import('Request', Request);
db['User'] = sequelize.import('User', User);
db['Blocked'] = sequelize.import('Blocked', Blocked);
+db['Tor'] = sequelize.import('Tor', Tor);
// run model.association for each model in the db object that has an association
logger.info('associating db models...');
diff --git a/server/models/tor.js b/server/models/tor.js
new file mode 100644
index 00000000..a314e92d
--- /dev/null
+++ b/server/models/tor.js
@@ -0,0 +1,59 @@
+const logger = require('winston');
+const { details: { ipAddress } } = require('@config/siteConfig');
+
+module.exports = (sequelize, { STRING }) => {
+ const Tor = sequelize.define(
+ 'Tor',
+ {
+ address: {
+ type : STRING,
+ allowNull: false,
+ },
+ fingerprint: {
+ type : STRING,
+ allowNull: true,
+ },
+ },
+ {
+ freezeTableName: true,
+ }
+ );
+
+ Tor.refreshTable = function () {
+ let torList = [];
+ return fetch(`https://check.torproject.org/api/bulk?ip=${ipAddress}&port=80`)
+ .then(response => {
+ return response.json();
+ })
+ .then(jsonResponse => {
+ logger.debug('total tor nodes:', jsonResponse.length);
+ // prep the records
+ for (let i = 0; i < jsonResponse.length; i++) {
+ torList.push({
+ address : jsonResponse[i].Address,
+ fingerprint: jsonResponse[i].Fingerprint,
+ });
+ }
+ // clear the table
+ return this.destroy({
+ truncate: true,
+ });
+ })
+ .then(() => {
+ // fill the table
+ return this.bulkCreate(torList);
+ })
+ .then(() => {
+ // return the new table
+ return this.findAll({
+ attributes: ['address', 'fingerprint'],
+ raw : true,
+ });
+ })
+ .catch(error => {
+ throw error;
+ });
+ };
+
+ return Tor;
+};
diff --git a/server/routes/api/index.js b/server/routes/api/index.js
index 0aabd472..bb24e5b2 100644
--- a/server/routes/api/index.js
+++ b/server/routes/api/index.js
@@ -1,9 +1,12 @@
+// middleware
+const multipartMiddleware = require('../../middleware/multipartMiddleware');
+const torCheckMiddleware = require('../../middleware/torCheckMiddleware');
+// route handlers
const channelAvailability = require('../../controllers/api/channel/availability');
const channelClaims = require('../../controllers/api/channel/claims');
const channelData = require('../../controllers/api/channel/data');
const channelShortId = require('../../controllers/api/channel/shortId');
const claimAvailability = require('../../controllers/api/claim/availability');
-const claimBlockedList = require('../../controllers/api/claim/blockedList');
const claimData = require('../../controllers/api/claim/data/');
const claimGet = require('../../controllers/api/claim/get');
const claimList = require('../../controllers/api/claim/list');
@@ -13,27 +16,34 @@ const claimResolve = require('../../controllers/api/claim/resolve');
const claimShortId = require('../../controllers/api/claim/shortId');
const fileAvailability = require('../../controllers/api/file/availability');
const userPassword = require('../../controllers/api/user/password');
+const publishingConfig = require('../../controllers/api/config/site/publishing');
+const getTorList = require('../../controllers/api/tor');
+const getBlockedList = require('../../controllers/api/blocked');
-const multipartMiddleware = require('../utils/multipartMiddleware');
module.exports = (app) => {
// channel routes
- app.get('/api/channel/availability/:name', channelAvailability);
- app.get('/api/channel/short-id/:longId/:name', channelShortId);
- app.get('/api/channel/data/:channelName/:channelClaimId', channelData);
- app.get('/api/channel/claims/:channelName/:channelClaimId/:page', channelClaims);
+ app.get('/api/channel/availability/:name', torCheckMiddleware, channelAvailability);
+ app.get('/api/channel/short-id/:longId/:name', torCheckMiddleware, channelShortId);
+ app.get('/api/channel/data/:channelName/:channelClaimId', torCheckMiddleware, channelData);
+ app.get('/api/channel/claims/:channelName/:channelClaimId/:page', torCheckMiddleware, channelClaims);
// claim routes
- app.get('/api/claim/availability/:name', claimAvailability);
- app.get('/api/claim/blocked-list/', claimBlockedList);
- app.get('/api/claim/data/:claimName/:claimId', claimData);
- app.get('/api/claim/get/:name/:claimId', claimGet);
- app.get('/api/claim/list/:name', claimList);
- app.post('/api/claim/long-id', claimLongId);
- app.post('/api/claim/publish', multipartMiddleware, claimPublish);
- app.get('/api/claim/resolve/:name/:claimId', claimResolve);
- app.get('/api/claim/short-id/:longId/:name', claimShortId);
+ app.get('/api/claim/availability/:name', torCheckMiddleware, claimAvailability);
+ app.get('/api/claim/data/:claimName/:claimId', torCheckMiddleware, claimData);
+ app.get('/api/claim/get/:name/:claimId', torCheckMiddleware, claimGet);
+ app.get('/api/claim/list/:name', torCheckMiddleware, claimList);
+ app.post('/api/claim/long-id', torCheckMiddleware, claimLongId); // note: should be a 'get'
+ app.post('/api/claim/publish', torCheckMiddleware, multipartMiddleware, claimPublish);
+ app.get('/api/claim/resolve/:name/:claimId', torCheckMiddleware, claimResolve);
+ app.get('/api/claim/short-id/:longId/:name', torCheckMiddleware, claimShortId);
// file routes
- app.get('/api/file/availability/:name/:claimId', fileAvailability);
+ app.get('/api/file/availability/:name/:claimId', torCheckMiddleware, fileAvailability);
// user routes
- app.put('/api/user/password/', userPassword);
+ app.put('/api/user/password/', torCheckMiddleware, userPassword);
+ // configs
+ app.get('/api/config/site/publishing', torCheckMiddleware, publishingConfig);
+ // tor
+ app.get('/api/tor', torCheckMiddleware, getTorList);
+ // blocked
+ app.get('/api/blocked', torCheckMiddleware, getBlockedList);
};
diff --git a/server/routes/assets/index.js b/server/routes/assets/index.js
index 4e87d2dd..5d4f92d1 100644
--- a/server/routes/assets/index.js
+++ b/server/routes/assets/index.js
@@ -1,7 +1,9 @@
-const serveAssetByClaim = require('../../controllers/assets/serveByClaim');
-const serveAssetByIdentifierAndClaim = require('../../controllers/assets/serveByIdentifierAndClaim');
+const serveByClaim = require('../../controllers/assets/serveByClaim');
+const serveByIdentifierAndClaim = require('../../controllers/assets/serveByIdentifierAndClaim');
+const serveAsset = require('../../controllers/assets/serveAsset');
-module.exports = (app, db) => {
- app.get('/:identifier/:claim', serveAssetByIdentifierAndClaim);
- app.get('/:claim', serveAssetByClaim);
+module.exports = (app) => {
+ app.get('/asset/:claimName/:claimId/', serveAsset);
+ app.get('/:identifier/:claim', serveByIdentifierAndClaim);
+ app.get('/:claim', serveByClaim);
};
diff --git a/server/routes/pages/index.js b/server/routes/pages/index.js
index 2c62b1aa..2dff606b 100644
--- a/server/routes/pages/index.js
+++ b/server/routes/pages/index.js
@@ -1,5 +1,5 @@
const handlePageRequest = require('../../controllers/pages/sendReactApp');
-const handleEmbedRequest = require('../../controllers/pages/sendEmbedPage');
+const handleVideoEmbedRequest = require('../../controllers/pages/sendVideoEmbedPage');
const redirect = require('../../controllers/utils/redirect');
module.exports = (app) => {
@@ -10,5 +10,5 @@ module.exports = (app) => {
app.get('/popular', handlePageRequest);
app.get('/new', handlePageRequest);
app.get('/multisite', handlePageRequest);
- app.get('/embed/:claimId/:name', handleEmbedRequest); // route to send embedable video player (for twitter)
+ app.get('/video-embed/:name/:claimId', handleVideoEmbedRequest); // for twitter
};
diff --git a/test/test.html b/test/test.html
new file mode 100644
index 00000000..01a5d622
--- /dev/null
+++ b/test/test.html
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
Publishing is currently disabled.
+{message}
+
+ no identifier, no ending
+no identifier, yes ending
+
+ yes identifier, no ending
+yes identifier, yes ending
+
+
+