-
-
Notifications
You must be signed in to change notification settings - Fork 354
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[mirotalksfu] - improve security, update dep
- Loading branch information
1 parent
6bf0908
commit 1727e64
Showing
9 changed files
with
105 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,7 +55,7 @@ dev dependencies: { | |
| * @license For commercial or closed source, contact us at [email protected] or purchase directly via CodeCanyon | ||
| * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 | ||
| * @author Miroslav Pejic - [email protected] | ||
| * @version 1.7.19 | ||
| * @version 1.7.20 | ||
| * | ||
| */ | ||
|
|
||
|
|
@@ -73,8 +73,10 @@ const axios = require('axios'); | |
| const ngrok = require('ngrok'); | ||
| const jwt = require('jsonwebtoken'); | ||
| const fs = require('fs'); | ||
| const sanitizeFilename = require('sanitize-filename'); | ||
| const helmet = require('helmet'); | ||
| const config = require('./config'); | ||
| const checkXSS = require('./XSS.js'); | ||
| const checkXSS = require('./XSS'); | ||
| const Host = require('./Host'); | ||
| const Room = require('./Room'); | ||
| const Peer = require('./Peer'); | ||
|
|
@@ -226,16 +228,28 @@ const OIDC = config.oidc ? config.oidc : { enabled: false }; | |
| const dir = { | ||
| public: path.join(__dirname, '../../', 'public'), | ||
| rec: path.join(__dirname, '../', config?.server?.recording?.dir ? config.server.recording.dir + '/' : 'rec/'), | ||
| rtmp: path.join(__dirname, '../', config?.rtmp?.dir ? config.rtmp.dir + '/' : 'rtmp/'), | ||
| }; | ||
|
|
||
| // rec directory create | ||
| // Rec directory create and set max file size | ||
| const recMaxFileSize = config?.server?.recording?.maxFileSize || 1 * 1024 * 1024 * 1024; // 1GB default | ||
| const serverRecordingEnabled = config?.server?.recording?.enabled; | ||
| if (serverRecordingEnabled) { | ||
| log.debug('Server Recording enabled creating dir', dir.rtmp); | ||
| if (!fs.existsSync(dir.rec)) { | ||
| fs.mkdirSync(dir.rec, { recursive: true }); | ||
| } | ||
| } | ||
|
|
||
| // Rtmp directory create | ||
| const rtmpEnabled = rtmpCfg && rtmpCfg.enabled; | ||
| if (rtmpEnabled) { | ||
| log.debug('RTMP enabled creating dir', dir.rtmp); | ||
| if (!fs.existsSync(dir.rtmp)) { | ||
| fs.mkdirSync(dir.rtmp, { recursive: true }); | ||
| } | ||
| } | ||
|
|
||
| // html views | ||
| const views = { | ||
| html: path.join(__dirname, '../../public/views'), | ||
|
|
@@ -340,6 +354,8 @@ function OIDCAuth(req, res, next) { | |
|
|
||
| function startServer() { | ||
| // Start the app | ||
| app.use(helmet.xssFilter()); // Enable XSS protection | ||
| app.use(helmet.noSniff()); // Enable content type sniffing prevention | ||
| app.use(express.static(dir.public)); | ||
| app.use(cors(corsOptions)); | ||
| app.use(compression()); | ||
|
|
@@ -769,8 +785,10 @@ function startServer() { | |
| return res.status(400).send('Filename not provided'); | ||
| } | ||
|
|
||
| if (!Validator.isValidRecFileNameFormat(fileName)) { | ||
| log.warn('[RecSync] - Invalid file name', fileName); | ||
| // Sanitize and validate filename | ||
| const safeFileName = sanitizeFilename(fileName); | ||
| if (safeFileName !== fileName || !Validator.isValidRecFileNameFormat(fileName)) { | ||
| log.warn('[RecSync] - Invalid file name:', fileName); | ||
| return res.status(400).send('Invalid file name'); | ||
| } | ||
|
|
||
|
|
@@ -782,11 +800,37 @@ function startServer() { | |
| return res.status(400).send('Invalid file name'); | ||
| } | ||
|
|
||
| // Ensure directory exists | ||
| if (!fs.existsSync(dir.rec)) { | ||
| fs.mkdirSync(dir.rec, { recursive: true }); | ||
| } | ||
| const filePath = dir.rec + fileName; | ||
|
|
||
| // Resolve and validate file path | ||
| const filePath = path.resolve(dir.rec, fileName); | ||
| if (!filePath.startsWith(path.resolve(dir.rec))) { | ||
| log.warn('[RecSync] - Attempt to save file outside allowed directory:', fileName); | ||
| return res.status(400).send('Invalid file path'); | ||
| } | ||
|
|
||
| //Validate content type | ||
| if (!['application/octet-stream'].includes(req.headers['content-type'])) { | ||
| log.warn('[RecSync] - Invalid content type:', req.headers['content-type']); | ||
| return res.status(400).send('Invalid content type'); | ||
| } | ||
|
|
||
| // Set up write stream and handle file upload | ||
| const writeStream = fs.createWriteStream(filePath, { flags: 'a' }); | ||
| let receivedBytes = 0; | ||
|
|
||
| req.on('data', (chunk) => { | ||
| receivedBytes += chunk.length; | ||
| if (receivedBytes > recMaxFileSize) { | ||
| req.destroy(); // Stop receiving data | ||
| writeStream.destroy(); // Stop writing data | ||
| log.warn('[RecSync] - File size exceeds limit:', fileName); | ||
| return res.status(413).send('File too large'); | ||
| } | ||
| }); | ||
|
|
||
| req.pipe(writeStream); | ||
|
|
||
|
|
@@ -841,7 +885,6 @@ function startServer() { | |
| }); | ||
|
|
||
| app.get('/rtmpEnabled', (req, res) => { | ||
| const rtmpEnabled = rtmpCfg && rtmpCfg.enabled; | ||
| log.debug('RTMP enabled', rtmpEnabled); | ||
| res.json({ enabled: rtmpEnabled }); | ||
| }); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ if (location.href.substr(0, 5) !== 'https') location.href = 'https' + location.h | |
| * @license For commercial or closed source, contact us at [email protected] or purchase directly via CodeCanyon | ||
| * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 | ||
| * @author Miroslav Pejic - [email protected] | ||
| * @version 1.7.19 | ||
| * @version 1.7.20 | ||
| * | ||
| */ | ||
|
|
||
|
|
@@ -4903,19 +4903,15 @@ function showAbout() { | |
| Swal.fire({ | ||
| background: swalBackground, | ||
| position: 'center', | ||
| imageUrl: BRAND.about?.imageUrl && BRAND.about.imageUrl.trim() !== '' | ||
| ? BRAND.about.imageUrl | ||
| : image.about, | ||
| imageUrl: BRAND.about?.imageUrl && BRAND.about.imageUrl.trim() !== '' ? BRAND.about.imageUrl : image.about, | ||
| customClass: { image: 'img-about' }, | ||
| title: BRAND.about?.title && BRAND.about.title.trim() !== '' | ||
| ? BRAND.about.title | ||
| : 'WebRTC SFU v1.7.19', | ||
| title: BRAND.about?.title && BRAND.about.title.trim() !== '' ? BRAND.about.title : 'WebRTC SFU v1.7.20', | ||
| html: ` | ||
| <br /> | ||
| <div id="about"> | ||
| ${ | ||
| BRAND.about?.html && BRAND.about.html.trim() !== '' | ||
| ? BRAND.about.html | ||
| BRAND.about?.html && BRAND.about.html.trim() !== '' | ||
| ? BRAND.about.html | ||
| : ` | ||
| <button | ||
| id="support-button" | ||
|
|
@@ -4951,4 +4947,4 @@ function showAbout() { | |
| showClass: { popup: 'animate__animated animate__fadeInDown' }, | ||
| hideClass: { popup: 'animate__animated animate__fadeOutUp' }, | ||
| }); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| * @license For commercial or closed source, contact us at [email protected] or purchase directly via CodeCanyon | ||
| * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 | ||
| * @author Miroslav Pejic - [email protected] | ||
| * @version 1.7.19 | ||
| * @version 1.7.20 | ||
| * | ||
| */ | ||
|
|
||
|
|
||