[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs]
From:       yijil () helixcommunity ! org
Date:       2011-12-23 8:26:33
[Download RAW message or body]

Update of /cvsroot/server/admin/web/build/mserver
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv19522/server/admin/web/build/mserver


Modified Files:
	config_broad_rtmp_ingress.html 
Log Message:
Commiter to: SERVER_14_3_RN and SERVER_CURRENT_RN

Synopsis:
=========
Fixes: Bug 270034: Netmask value used with RTMP Ingress should be restricted

Branch: SERVER_14_3_RN and SERVER_CURRENT_RN

Reviewed by: Dean and Chytanya

Description:
============
Steps:
- Configure the server to accept RTMP Encoding sessions from an IP and netmask \
                combination where the netmask has a value greater than 32 (see below)
- Start an RTMP Ingress session to the server
Expected:
- user should not be allowed to submit this value (values outside of 0-32) in the \
                admin
- accept all zero IP address
- when user manually configures netmask, if netmask is larger than 32 when IPv4, set \
netmask to 32, if netmask is larger than 128 when IPv6, set netmask to 128

My solution is:
Change new PropObj( 'IPAddress', 	"", false, true, null, null, "hostname", "IP \
Address/Netmask" ) to new PropObj( 'IPAddress', 	"", false, true, null, null, \
"ipzero", "IP Address/Netmask" ) in config_broad_rtmp_ingress.html Add code in \
function RTMPEncoderAccessRule::Match() to check netmask value, and set netmask \
value.

Files affected:
===============
server/admin/web/src/srvprxy/config_broad_rtmp_ingress.html.wasm
server/admin/web/build/server/config_broad_rtmp_ingress.html
server/admin/web/build/mserver/config_broad_rtmp_ingress.html
server_rn/protocol/flash/utils/rtmpencodervalidator.cpp
server_rn/protocol/flash/utils/pub/rtmpencodervalidator.h

Testing Performed:
================
Unit Tests:
1. enter IP Address/Netmask
When 192.168.1.102/33, alert "Invalid Netmask: An IPv4 address requires a netmask of \
32 bits or less" When 192.168.1.102/abc, alert "Invalid IP Address"
When fe80::307a:2c6d:207:cbda/129, alert " Invalid Netmask: prefixes must 128(bits) \
or less" When fe80::307a:2c6d:207:cbda/abc, alert " Invalid IPv6 Address "
When fe80::307a:2c6d:207:cbda/15 or 192.168.1.102 or 192.168.1.102/31, succeed When \
0.0.0.0, succeed

Integration Tests:
None

Leak Tests: None
Performance Tests: N/A

Platforms Tested: win-x86-vc10 Builds Verified: win-x86-vc10

QA Hints
========
None.



Index: config_broad_rtmp_ingress.html
===================================================================
RCS file: /cvsroot/server/admin/web/build/mserver/config_broad_rtmp_ingress.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config_broad_rtmp_ingress.html	7 Dec 2011 06:06:24 -0000	1.4
+++ config_broad_rtmp_ingress.html	23 Dec 2011 08:26:30 -0000	1.5
@@ -46,7 +46,7 @@
 
 var propSetSources =
 [
-    new PropObj( 'IPAddress', 	"", false, true, null, null, "hostname", "IP \
Address/Netmask" ), +    new PropObj( 'IPAddress', 	"", false, true, null, null, \
"ipzero", "IP Address/Netmask" ),  ];
 
 var propSetMain =
@@ -97,6 +97,12 @@
     return true;
 }
 
+RTMPIngressPropView.prototype.preValidate = function ()
+{
+	this.m_allowAny = 0;
+	return true;
+}
+
 RTMPIngressPropView.prototype.postValidate = function ()
 {
     var prop = this.m_propList.prop("Enable");


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]