You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2011/04/03 20:34:50 UTC
svn commit: r1088371 [1/2] - in /trafficserver/traffic/trunk:
contrib/perl/AdminClient/lib/Apache/TS/ cop/ doc/man/ mgmt/ mgmt/api/
mgmt/api/include/ mgmt/api/remote/ mgmt/cli/ mgmt/tools/ mgmt/utils/
mgmt/web2/ proxy/ proxy/config/ proxy/http/remap/
Author: zwoop
Date: Sun Apr 3 18:34:48 2011
New Revision: 1088371
URL: http://svn.apache.org/viewvc?rev=1088371&view=rev
Log:
TS-641 Remove a bunch of Web UI related configs and code
This also adds a new configuration for autopac doc root:
proxy.config.admin.autoconf.doc_root
It still defaults to etc/trafficserver, but can be modified.
Removed:
trafficserver/traffic/trunk/mgmt/web2/MgmtAllow.cc
trafficserver/traffic/trunk/mgmt/web2/MgmtAllow.h
trafficserver/traffic/trunk/mgmt/web2/WebConfigRender.cc
trafficserver/traffic/trunk/mgmt/web2/WebConfigRender.h
trafficserver/traffic/trunk/mgmt/web2/WebHttpAuth.cc
trafficserver/traffic/trunk/mgmt/web2/WebHttpAuth.h
trafficserver/traffic/trunk/mgmt/web2/WebHttpLog.cc
trafficserver/traffic/trunk/mgmt/web2/WebHttpLog.h
trafficserver/traffic/trunk/mgmt/web2/WebHttpRender.cc
trafficserver/traffic/trunk/mgmt/web2/WebHttpRender.h
trafficserver/traffic/trunk/mgmt/web2/WebReconfig.cc
trafficserver/traffic/trunk/mgmt/web2/WebReconfig.h
trafficserver/traffic/trunk/proxy/config/admin_access.config.default
trafficserver/traffic/trunk/proxy/config/mgmt_allow.config.default
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/cop/TrafficCop.cc
trafficserver/traffic/trunk/doc/man/config_security.1
trafficserver/traffic/trunk/doc/man/show_security.1
trafficserver/traffic/trunk/mgmt/AddConfigFilesHere.cc
trafficserver/traffic/trunk/mgmt/LocalManager.cc
trafficserver/traffic/trunk/mgmt/Main.cc
trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.cc
trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.h
trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.cc
trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.h
trafficserver/traffic/trunk/mgmt/api/GenericParser.cc
trafficserver/traffic/trunk/mgmt/api/GenericParser.h
trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc
trafficserver/traffic/trunk/mgmt/api/include/mgmtapi.h
trafficserver/traffic/trunk/mgmt/api/remote/APITestCliRemote.cc
trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc
trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.h
trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc
trafficserver/traffic/trunk/mgmt/cli/cli_detailed_command_list.txt
trafficserver/traffic/trunk/mgmt/cli/script_configs.sh
trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc
trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc
trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.h
trafficserver/traffic/trunk/mgmt/web2/Makefile.am
trafficserver/traffic/trunk/mgmt/web2/WebGlobals.h
trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc
trafficserver/traffic/trunk/mgmt/web2/WebHttp.h
trafficserver/traffic/trunk/mgmt/web2/WebHttpContext.cc
trafficserver/traffic/trunk/mgmt/web2/WebHttpContext.h
trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.h
trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc
trafficserver/traffic/trunk/mgmt/web2/WebUtils.cc
trafficserver/traffic/trunk/mgmt/web2/WebUtils.h
trafficserver/traffic/trunk/proxy/ReverseProxy.cc
trafficserver/traffic/trunk/proxy/config/Makefile.am
trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc
Modified: trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm (original)
+++ trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm Sun Apr 3 18:34:48 2011
@@ -265,31 +265,15 @@ The Apache Traffic Server Administration
proxy.config.accept_threads
proxy.config.task_threads
- proxy.config.admin.access_control_file
- proxy.config.admin.admin_password
proxy.config.admin.admin_user
- proxy.config.admin.advanced_ui
proxy.config.admin.autoconf.localhost_only
proxy.config.admin.autoconf.pac_filename
proxy.config.admin.autoconf_port
+ proxy.config.admin.autoconf.doc_root
proxy.config.admin.autoconf.wpad_filename
- proxy.config.admin.basic_auth
proxy.config.admin.cli_path
- proxy.config.admin.cli_port
- proxy.config.admin.html_doc_root
- proxy.config.admin.ip_allow.filename
- proxy.config.admin.lang_dict
- proxy.config.admin.load_factor
- proxy.config.admin.log_mgmt_access
- proxy.config.admin.log_resolve_hostname
proxy.config.admin.number_config_bak
- proxy.config.admin.session
- proxy.config.admin.session.timeout
- proxy.config.admin.ssl_cert_file
- proxy.config.admin.ui_refresh_rate
proxy.config.admin.user_id
- proxy.config.admin.use_ssl
- proxy.config.admin.web_interface_port
proxy.config.alarm.abs_path
proxy.config.alarm.bin
proxy.config.alarm_email
@@ -392,7 +376,6 @@ The Apache Traffic Server Administration
proxy.config.exec_thread.autoconfig
proxy.config.exec_thread.autoconfig.scale
proxy.config.exec_thread.limit
- proxy.config.feature_set
proxy.config.header.parse.no_host_url_redirect
proxy.config.history_info_enabled
proxy.config.hostdb
Modified: trafficserver/traffic/trunk/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/cop/TrafficCop.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/cop/TrafficCop.cc Sun Apr 3 18:34:48 2011
@@ -670,7 +670,7 @@ read_config()
read_config_string("proxy.config.output.logfile", log_filename, sizeof(log_filename));
Layout::relative_to(log_file, sizeof(log_file), log_dir, log_filename);
read_config_int("proxy.config.process_manager.mgmt_port", &http_backdoor_port);
- read_config_int("proxy.config.admin.autoconf_port", &autoconf_port);
+ read_config_int("proxy.config.admin.autoconf.port", &autoconf_port);
read_config_int("proxy.config.cluster.rsport", &rs_port);
read_config_int("proxy.config.lm.sem_id", &sem_id);
Modified: trafficserver/traffic/trunk/doc/man/config_security.1
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/doc/man/config_security.1?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/doc/man/config_security.1 (original)
+++ trafficserver/traffic/trunk/doc/man/config_security.1 Sun Apr 3 18:34:48 2011
@@ -48,24 +48,5 @@ the Traffic Manager UI.
.nf
traffic_shell> config:security ip-allow http://something.com/ip_allow.config
traffic_shell>
-.SS "Example 2. Locating the access file to specify remote host access to the Traffic Manager UI"
-.PP
-.nf
-traffic_shell> config:security mgmt-allow http://something.com/mgmt_allow.config
-traffic_shell>
-.SS "Example 3. Locating the access file to specify administrators with access to the Traffic Manager UI"
-.PP
-.nf
-traffic_shell> config:security admin http://something.com/admin_access.config
-traffic_shell>
-.SS "Example 4. Specifying the administrator's password"
-.PP
-.nf
-traffic_shell> config:security password
-Enter Old Password:
-Enter New Password:
-ReEnter New Password:
-Password Set
-traffic_shell>
.SH "SEE ALSO"
show:security
Modified: trafficserver/traffic/trunk/doc/man/show_security.1
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/doc/man/show_security.1?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/doc/man/show_security.1 (original)
+++ trafficserver/traffic/trunk/doc/man/show_security.1 Sun Apr 3 18:34:48 2011
@@ -32,8 +32,6 @@ Web Interface Port ----- 8081
Overseer Port ---------- 8082
Traffic Server Access
(ip_allow.config contents)
-Traffic Manager Access
- (mgmt_allow.config contents)
traffic_shell>
.SH "SEE ALSO"
config:security
Modified: trafficserver/traffic/trunk/mgmt/AddConfigFilesHere.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/AddConfigFilesHere.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/AddConfigFilesHere.cc (original)
+++ trafficserver/traffic/trunk/mgmt/AddConfigFilesHere.cc Sun Apr 3 18:34:48 2011
@@ -76,12 +76,10 @@ initializeRegistry()
configFiles->addFile("vaddrs.config", false);
configFiles->addFile("cache.config", false);
configFiles->addFile("icp.config", false);
- configFiles->addFile("mgmt_allow.config", false);
configFiles->addFile("ip_allow.config", false);
configFiles->addFile("parent.config", false);
configFiles->addFile("remap.config", false);
configFiles->addFile("update.config", false);
- configFiles->addFile("admin_access.config", false);
configFiles->addFile("volume.config", false);
configFiles->addFile("hosting.config", false);
configFiles->addFile("congestion.config", false);
Modified: trafficserver/traffic/trunk/mgmt/LocalManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/LocalManager.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/mgmt/LocalManager.cc Sun Apr 3 18:34:48 2011
@@ -37,7 +37,6 @@
#include "I_Layout.h"
#include "Compatability.h"
#include "LocalManager.h"
-#include "WebReconfig.h"
#include "MgmtSocket.h"
#if TS_USE_POSIX_CAP
@@ -55,8 +54,6 @@ LocalManager::SetForDup(void *hIOCPort,
return true;
}
-
-
void
LocalManager::mgmtCleanup()
{
@@ -997,12 +994,6 @@ LocalManager::processEventQueue()
}
handled_by_mgmt = true;
}
- // admin_access.config
- if (!(strcmp(data_raw, "admin_access.config"))) {
- markAuthOtherUsersChange();
- handled_by_mgmt = true;
- }
-
}
if (!handled_by_mgmt) {
Modified: trafficserver/traffic/trunk/mgmt/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/Main.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/Main.cc (original)
+++ trafficserver/traffic/trunk/mgmt/Main.cc Sun Apr 3 18:34:48 2011
@@ -40,7 +40,6 @@
#include "WebIntrMain.h"
#include "WebOverview.h"
#include "FileManager.h"
-#include "WebReconfig.h"
#include "I_Layout.h"
#include "I_Version.h"
#include "ink_syslog.h"
@@ -495,10 +494,6 @@ main(int argc, char **argv)
initSignalHandlers();
// Process Environment Variables
- if ((envVar = getenv("MGMT_WEB_PORT")) != NULL) {
- web_port_arg = atoi(envVar);
- }
-
if ((envVar = getenv("MGMT_ACONF_PORT")) != NULL) {
aconf_port_arg = atoi(envVar);
}
@@ -529,10 +524,7 @@ main(int argc, char **argv)
// The rest of the options require an argument in the form of -<Flag> <val>
if ((i + 1) < argc) {
- if (strcmp(argv[i], "-webPort") == 0) {
- ++i;
- web_port_arg = atoi(argv[i]);
- } else if (strcmp(argv[i], "-aconfPort") == 0) {
+ if (strcmp(argv[i], "-aconfPort") == 0) {
++i;
aconf_port_arg = atoi(argv[i]);
} else if (strcmp(argv[i], "-clusterPort") == 0) {
@@ -826,7 +818,6 @@ main(int argc, char **argv)
// Now that we know our cluster ip address, add the
// UI record for this machine
overviewGenerator->addSelfRecord();
-
webThrId = ink_thread_create(webIntr_main, NULL); /* Spin web agent thread */
Debug("lm", "Created Web Agent thread (%d)", webThrId);
lmgmt->listenForProxy();
@@ -1152,11 +1143,6 @@ fileUpdated(char *fname)
} else if (strcmp(fname, "parent.config") == 0) {
lmgmt->signalFileChange("proxy.config.http.parent_proxy.file");
- } else if (strcmp(fname, "mgmt_allow.config") == 0) {
- lmgmt->signalFileChange("proxy.config.admin.ip_allow.filename");
- // signalFileChange does not cause callbacks in the manager
- // so generate one here by hand
- markMgmtIpAllowChange();
} else if (strcmp(fname, "ip_allow.config") == 0) {
lmgmt->signalFileChange("proxy.config.cache.ip_allow.filename");
} else if (strcmp(fname, "vaddrs.config") == 0) {
@@ -1178,9 +1164,6 @@ fileUpdated(char *fname)
} else if (strcmp(fname, "update.config") == 0) {
lmgmt->signalFileChange("proxy.config.update.update_configuration");
- } else if (strcmp(fname, "admin_access.config") == 0) {
- lmgmt->signalFileChange("admin_access.config");
-
} else if (strcmp(fname, "volume.config") == 0) {
mgmt_log(stderr, "[fileUpdated] volume.config changed, need restart\n");
Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Sun Apr 3 18:34:48 2011
@@ -246,11 +246,9 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.cluster.log_bogus_mc_msgs", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.admin.html_doc_root", RECD_STRING, "<html_doc_root>", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.admin.autoconf.port", RECD_INT, "8083", RECU_RESTART_TM, RR_REQUIRED, RECC_INT, "[0-65535]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.admin.web_interface_port", RECD_INT, "8081", RECU_RESTART_TM, RR_REQUIRED, RECC_INT, "[0-65535]", RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.autoconf_port", RECD_INT, "8083", RECU_RESTART_TM, RR_REQUIRED, RECC_INT, "[0-65535]", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.admin.autoconf.doc_root", RECD_STRING, "etc/trafficserver", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.admin.autoconf.localhost_only", RECD_INT, "0", RECU_RESTART_TM, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
@@ -260,44 +258,12 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.admin.admin_user", RECD_STRING, "<admin_user_name>", RECU_DYNAMIC, RR_REQUIRED, RECC_STR, ".+", RECA_NO_ACCESS}
,
- {RECT_CONFIG, "proxy.config.admin.admin_password", RECD_STRING, "<admin_user_password>", RECU_DYNAMIC, RR_REQUIRED, RECC_STR, ".*", RECA_NO_ACCESS}
- ,
- {RECT_CONFIG, "proxy.config.admin.access_control_file", RECD_STRING, "admin_access.config", RECU_RESTART_TM, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.feature_set", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.basic_auth", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.use_ssl", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.ssl_cert_file", RECD_STRING, "private_key.pem", RECU_RESTART_TM, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.admin.number_config_bak", RECD_INT, "3", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.admin.user_id", RECD_STRING, TS_PKGSYSUSER, RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.admin.ui_refresh_rate", RECD_INT, "30", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.load_factor", RECD_FLOAT, "250.00", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.log_mgmt_access", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.log_resolve_hostname", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.ip_allow.filename", RECD_STRING, "mgmt_allow.config", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.advanced_ui", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.admin.cli_path", RECD_STRING, "cli", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.admin.cli_port", RECD_INT, "9000", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.lang_dict", RECD_STRING, "english.dict", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.session", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.admin.session.timeout", RECD_INT, "600", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
//##############################################################################
//#
@@ -1451,8 +1417,6 @@ RecordElement RecordsConfig[] = {
,
{RECT_NODE, "proxy.node.hostname", RECD_STRING, NULL, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_NODE, "proxy.node.xact_scale", RECD_INT, "200", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
//#
//# Restart Stats
//#
Modified: trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.cc (original)
+++ trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.cc Sun Apr 3 18:34:48 2011
@@ -71,160 +71,6 @@ CommentObj::getCfgEleCopy()
return (TSCfgEle *) copy_comment_ele(m_ele);
}
-//--------------------------------------------------------------------------
-// AdminAccessObj
-//--------------------------------------------------------------------------
-AdminAccessObj::AdminAccessObj(TSAdminAccessEle * ele)
-{
- m_ele = ele;
- m_valid = true;
- m_valid = isValid();
-}
-
-AdminAccessObj::AdminAccessObj(TokenList * tokens)
-{
- Token *tok;
- int accessType;
-
- m_ele = TSAdminAccessEleCreate();
- m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
-
- if (!tokens || tokens->length < 3) {
- goto FORMAT_ERR;
- }
-
- m_ele->cfg_ele.type = get_rule_type(tokens, TS_FNAME_ADMIN_ACCESS);
- if (m_ele->cfg_ele.type == TS_TYPE_UNDEFINED) {
- goto FORMAT_ERR;
- }
- // The first token
- tok = tokens->first();
-#ifdef TIGHT_RULE_CHECK
- if (tok->value)
- goto FORMAT_ERR;
-#endif
- m_ele->user = xstrdup(tok->name);
-
- // The second token
- tok = tokens->next(tok);
-#ifdef TIGHT_RULE_CHECK
- if (tok->value)
- goto FORMAT_ERR;
-#endif
- m_ele->password = xstrdup(tok->name);
-
- // The third (last) token
- tok = tokens->next(tok);
-#ifdef TIGHT_RULE_CHECK
- if (tok->value)
- goto FORMAT_ERR;
-#endif
- accessType = ink_atoi(tok->name);
- switch (accessType) {
- case 0:
- m_ele->access = TS_ACCESS_NONE;
- break;
- case 1:
- m_ele->access = TS_ACCESS_MONITOR;
- break;
- case 2:
- m_ele->access = TS_ACCESS_MONITOR_VIEW;
- break;
- case 3:
- m_ele->access = TS_ACCESS_MONITOR_CHANGE;
- break;
- default:
- m_ele->access = TS_ACCESS_UNDEFINED;
- goto FORMAT_ERR;
- }
- m_ele->cfg_ele.error = TS_ERR_OKAY;
- return;
-
-FORMAT_ERR:
- m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
-}
-
-AdminAccessObj::~AdminAccessObj()
-{
- TSAdminAccessEleDestroy(m_ele);
-}
-
-char *
-AdminAccessObj::formatEleToRule()
-{
- if (!isValid()) {
- m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- return NULL;
- }
-
- short accessType;
-
- char buf[MAX_RULE_SIZE];
- memset(buf, 0, MAX_RULE_SIZE);
-
- switch (m_ele->access) {
- case TS_ACCESS_NONE:
- accessType = 0;
- break;
- case TS_ACCESS_MONITOR:
- accessType = 1;
- break;
- case TS_ACCESS_MONITOR_VIEW:
- accessType = 2;
- break;
- case TS_ACCESS_MONITOR_CHANGE:
- accessType = 3;
- break;
- default:
- accessType = 0; // lv: just zero it
- // Handled here:
- // TS_ACCESS_UNDEFINED
- break;
- }
-
- snprintf(buf, sizeof(buf), "%s:%s:%d:", m_ele->user, m_ele->password, accessType);
-
- return xstrdup(buf);
-}
-
-bool AdminAccessObj::isValid()
-{
- if (m_ele->cfg_ele.error != TS_ERR_OKAY) {
- m_valid = false;
- }
- // Must have a user
- if (!m_ele->user) {
- m_valid = false;
- }
- // Must have a password
- if (!m_ele->password) {
- m_valid = false;
- }
- // validate access type
- switch (m_ele->access) {
- case TS_ACCESS_NONE:
- case TS_ACCESS_MONITOR:
- case TS_ACCESS_MONITOR_VIEW:
- case TS_ACCESS_MONITOR_CHANGE:
- break;
- default:
- m_valid = false;
- }
-
- if (!m_valid) {
- m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- }
-
- return m_valid;
-}
-
-TSCfgEle *
-AdminAccessObj::getCfgEleCopy()
-{
- return (TSCfgEle *) copy_admin_access_ele(m_ele);
-}
//--------------------------------------------------------------------------
// CacheObj
@@ -1140,142 +986,6 @@ IpAllowObj::getCfgEleCopy()
return (TSCfgEle *) copy_ip_allow_ele(m_ele);
}
-//--------------------------------------------------------------------------
-// MgmtAllowObj
-//--------------------------------------------------------------------------
-MgmtAllowObj::MgmtAllowObj(TSMgmtAllowEle * ele)
-{
- m_ele = ele;
- m_valid = true;
- m_valid = isValid();
-}
-
-MgmtAllowObj::MgmtAllowObj(TokenList * tokens)
-{
- Token *token;
-
- m_ele = TSMgmtAllowEleCreate();
- m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
-
- if (!tokens || (tokens->length != 2)) {
- goto FORMAT_ERR;
- }
-
- m_ele->cfg_ele.type = get_rule_type(tokens, TS_FNAME_IP_ALLOW);
- if (m_ele->cfg_ele.type == TS_TYPE_UNDEFINED) {
- goto FORMAT_ERR;
- }
-
- token = tokens->first();
- if (!token->name || strcmp(token->name, "src_ip")) {
- goto FORMAT_ERR;
- }
- if (!token->value) {
- goto FORMAT_ERR;
- } else {
- m_ele->src_ip_addr = string_to_ip_addr_ele(token->value);
- }
-
- token = tokens->next(token);
- if (!token->name || strcmp(token->name, "action")) {
- goto FORMAT_ERR;
- }
- if (!token->value) {
- goto FORMAT_ERR;
- } else {
- if (!strcmp(token->value, "ip_allow")) {
- m_ele->action = TS_MGMT_ALLOW_ALLOW;
- } else if (strcmp(token->value, "ip_deny") == 0) {
- m_ele->action = TS_MGMT_ALLOW_DENY;
- } else {
- m_ele->action = TS_MGMT_ALLOW_UNDEFINED;
- }
- }
- return;
-
-FORMAT_ERR:
- m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
-}
-
-MgmtAllowObj::~MgmtAllowObj()
-{
- TSMgmtAllowEleDestroy(m_ele);
-}
-
-char *
-MgmtAllowObj::formatEleToRule()
-{
- if (!isValid()) {
- m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- return NULL;
- }
-
- char *rule;
- char buf[MAX_RULE_SIZE];
- memset(buf, 0, MAX_RULE_SIZE);
-
- ink_strncpy(buf, "src_ip=", sizeof(buf));
- if (m_ele->src_ip_addr) {
- char *ip_str = ip_addr_ele_to_string(m_ele->src_ip_addr);
- if (ip_str) {
- strncat(buf, ip_str, sizeof(buf) - strlen(buf) - 1);
- xfree(ip_str);
- } else {
- return NULL;
- }
- }
-
- strncat(buf, " action=", sizeof(buf) - strlen(buf) - 1);
- switch (m_ele->action) {
- case TS_MGMT_ALLOW_ALLOW:
- strncat(buf, "ip_allow", sizeof(buf) - strlen(buf) - 1);
- break;
- case TS_MGMT_ALLOW_DENY:
- strncat(buf, "ip_deny", sizeof(buf) - strlen(buf) - 1);
- break;
- default:
- // Handled here:
- // TS_MGMT_ALLOW_UNDEFINED
- break;
- }
-
- rule = xstrdup(buf);
-
- return rule;
-}
-
-bool MgmtAllowObj::isValid()
-{
- if (m_ele->cfg_ele.error != TS_ERR_OKAY) {
- m_valid = false;
- }
- // must specify source IP addr
- if (!m_ele->src_ip_addr) {
- m_valid = false;
- }
-
- switch (m_ele->action) {
- case TS_MGMT_ALLOW_ALLOW:
- case TS_MGMT_ALLOW_DENY:
- break;
- default:
- m_valid = false;
- }
-
- if (!m_valid) {
- m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- }
- return m_valid;
-}
-
-TSCfgEle *
-MgmtAllowObj::getCfgEleCopy()
-{
- return (TSCfgEle *) copy_mgmt_allow_ele(m_ele);
-}
-
//--------------------------------------------------------------------------
// ParentProxyObj
Modified: trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.h?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.h (original)
+++ trafficserver/traffic/trunk/mgmt/api/CfgContextImpl.h Sun Apr 3 18:34:48 2011
@@ -102,30 +102,6 @@ private:
};
-/* admin_access.config ****************************************/
-class AdminAccessObj:public CfgEleObj
-{
-public:
- AdminAccessObj(TSAdminAccessEle * ele);
- AdminAccessObj(TokenList * tokens); //creates the ele
- ~AdminAccessObj();
-
- virtual char *formatEleToRule();
- virtual bool isValid();
- virtual TSCfgEle *getCfgEleCopy();
- virtual TSCfgEle *getCfgEle()
- {
- return (TSCfgEle *) m_ele;
- }
- virtual TSRuleTypeT getRuleType()
- {
- return m_ele->cfg_ele.type;
- }
-
-private:
- TSAdminAccessEle * m_ele;
-};
-
/* cache.config ***************************************************/
class CacheObj:public CfgEleObj
{
@@ -318,30 +294,6 @@ private:
};
-/* mgmt_allow.config *******************************************/
-class MgmtAllowObj:public CfgEleObj
-{
-public:
- MgmtAllowObj(TSMgmtAllowEle * ele);
- MgmtAllowObj(TokenList * tokens);
- ~MgmtAllowObj();
-
- virtual char *formatEleToRule();
- virtual bool isValid();
- virtual TSCfgEle *getCfgEleCopy();
- virtual TSCfgEle *getCfgEle()
- {
- return (TSCfgEle *) m_ele;
- }
- virtual TSRuleTypeT getRuleType()
- {
- return m_ele->cfg_ele.type;
- }
-
-private:
- TSMgmtAllowEle * m_ele;
-};
-
/* parent.config *******************************************/
class ParentProxyObj:public CfgEleObj
{
Modified: trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.cc (original)
+++ trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.cc Sun Apr 3 18:34:48 2011
@@ -1424,9 +1424,6 @@ char *
filename_to_string(TSFileNameT file)
{
switch (file) {
- case TS_FNAME_ADMIN_ACCESS:
- return xstrdup("admin_access.config");
-
case TS_FNAME_CACHE_OBJ:
return xstrdup("cache.config");
@@ -1446,9 +1443,6 @@ filename_to_string(TSFileNameT file)
case TS_FNAME_LOGS_XML:
return xstrdup("logs_xml.config");
- case TS_FNAME_MGMT_ALLOW:
- return xstrdup("mgmt_allow.config");
-
case TS_FNAME_PARENT_PROXY:
return xstrdup("parent.config");
@@ -1936,9 +1930,6 @@ create_ele_obj_from_rule_node(Rule * rul
// convert TokenList into an Ele
// need switch statement to determine which Ele constructor to call
switch (rule_type) {
- case TS_ADMIN_ACCESS: /* admin_access.config */
- ele = (CfgEleObj *) new AdminAccessObj(token_list);
- break;
case TS_CACHE_NEVER: /* all cache rules use same constructor */
case TS_CACHE_IGNORE_NO_CACHE:
case TS_CACHE_IGNORE_CLIENT_NO_CACHE:
@@ -1967,9 +1958,6 @@ create_ele_obj_from_rule_node(Rule * rul
case TS_LOG_FORMAT:
//ele = (CfgEleObj *) new LogFilterObj(token_list);
break;
- case TS_MGMT_ALLOW: /* mgmt_allow.config */
- ele = (CfgEleObj *) new MgmtAllowObj(token_list);
- break;
case TS_PP_PARENT: /* parent.config */
case TS_PP_GO_DIRECT:
ele = (CfgEleObj *) new ParentProxyObj(token_list);
@@ -2029,10 +2017,6 @@ create_ele_obj_from_ele(TSCfgEle * ele)
return NULL;
switch (ele->type) {
- case TS_ADMIN_ACCESS: /* admin_access.config */
- ele_obj = (CfgEleObj *) new AdminAccessObj((TSAdminAccessEle *) ele);
- break;
-
case TS_CACHE_NEVER: /* cache.config */
case TS_CACHE_IGNORE_NO_CACHE: // fall-through
case TS_CACHE_IGNORE_CLIENT_NO_CACHE: // fall-through
@@ -2066,10 +2050,6 @@ create_ele_obj_from_ele(TSCfgEle * ele)
//ele_obj = (CfgEleObj*) new LogFilterObj((TSLogFilterEle*)ele);
break;
- case TS_MGMT_ALLOW: /* mgmt_allow.config */
- ele_obj = (CfgEleObj *) new MgmtAllowObj((TSMgmtAllowEle *) ele);
- break;
-
case TS_PP_PARENT: /* parent.config */
case TS_PP_GO_DIRECT: // fall-through
ele_obj = (CfgEleObj *) new ParentProxyObj((TSParentProxyEle *) ele);
@@ -2137,9 +2117,6 @@ get_rule_type(TokenList * token_list, TS
/* Depending on the file and rule type, need to find out which
token specifies which type of rule it is */
switch (file) {
- case TS_FNAME_ADMIN_ACCESS: /* admin_access.config */
- return TS_ADMIN_ACCESS;
-
case TS_FNAME_CACHE_OBJ: /* cache.config */
tok = token_list->first();
while (tok != NULL) {
@@ -2190,9 +2167,6 @@ get_rule_type(TokenList * token_list, TS
// TS_LOG_FORMAT,
return TS_LOG_FILTER;
- case TS_FNAME_MGMT_ALLOW: /* mgmt_allow.config */
- return TS_MGMT_ALLOW;
-
case TS_FNAME_PARENT_PROXY: /* parent.config */
// search fro go_direct action name and recongize the value-> ture or false
for (tok = token_list->first(); tok; tok = token_list->next(tok)) {
@@ -2485,28 +2459,6 @@ copy_int_list(TSIntList list)
return nlist;
}
-//////////////////////////////////////////////////
-TSAdminAccessEle *
-copy_admin_access_ele(TSAdminAccessEle * ele)
-{
- if (!ele)
- return NULL;
-
- TSAdminAccessEle *nele = TSAdminAccessEleCreate();
- if (!nele)
- return NULL;
-
- copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
-
- if (ele->user)
- nele->user = xstrdup(ele->user);
- if (ele->password)
- nele->password = xstrdup(ele->password);
- nele->access = ele->access;
-
- return nele;
-}
-
TSCacheEle *
copy_cache_ele(TSCacheEle * ele)
{
@@ -2669,22 +2621,6 @@ copy_log_format_ele(TSLogFormatEle * ele
return nele;
}
-TSMgmtAllowEle *
-copy_mgmt_allow_ele(TSMgmtAllowEle * ele)
-{
- if (!ele) {
- return NULL;
- }
-
- TSMgmtAllowEle *nele = TSMgmtAllowEleCreate();
- if (!nele)
- return NULL;
- if (ele->src_ip_addr)
- nele->src_ip_addr = copy_ip_addr_ele(ele->src_ip_addr);
- nele->action = ele->action;
- return nele;
-}
-
TSLogObjectEle *
copy_log_object_ele(TSLogObjectEle * ele)
{
Modified: trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.h?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.h (original)
+++ trafficserver/traffic/trunk/mgmt/api/CfgContextUtils.h Sun Apr 3 18:34:48 2011
@@ -174,7 +174,6 @@ TSDomainList copy_domain_list(TSDomainLi
TSStringList copy_string_list(TSStringList list);
TSIntList copy_int_list(TSIntList list);
-TSAdminAccessEle *copy_admin_access_ele(TSAdminAccessEle * ele);
TSCacheEle *copy_cache_ele(TSCacheEle * ele);
TSCongestionEle *copy_congestion_ele(TSCongestionEle * ele);
TSHostingEle *copy_hosting_ele(TSHostingEle * ele);
@@ -183,7 +182,6 @@ TSIpAllowEle *copy_ip_allow_ele(TSIpAllo
TSLogFilterEle *copy_log_filter_ele(TSLogFilterEle * ele);
TSLogFormatEle *copy_log_format_ele(TSLogFormatEle * ele);
TSLogObjectEle *copy_log_object_ele(TSLogObjectEle * ele);
-TSMgmtAllowEle *copy_mgmt_allow_ele(TSMgmtAllowEle * ele);
TSParentProxyEle *copy_parent_proxy_ele(TSParentProxyEle * ele);
TSVolumeEle *copy_volume_ele(TSVolumeEle * ele);
TSPluginEle *copy_plugin_ele(TSPluginEle * ele);
Modified: trafficserver/traffic/trunk/mgmt/api/GenericParser.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/GenericParser.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/GenericParser.cc (original)
+++ trafficserver/traffic/trunk/mgmt/api/GenericParser.cc Sun Apr 3 18:34:48 2011
@@ -206,8 +206,6 @@ Rule::parse(const char *const_rule, TSFi
m_filetype = filetype;
switch (m_filetype) {
- case TS_FNAME_ADMIN_ACCESS: /* admin_access.config */
- return admin_accessParse(rule);
case TS_FNAME_CACHE_OBJ: /* cache.config */
return cacheParse(rule);
case TS_FNAME_CONGESTION: /* congestion.config */
@@ -220,8 +218,6 @@ Rule::parse(const char *const_rule, TSFi
return ip_allowParse(rule);
case TS_FNAME_LOGS_XML: /* logs_xml.config */
return logs_xmlParse(rule);
- case TS_FNAME_MGMT_ALLOW: /* mgmt_allow.config */
- return mgmt_allowParse(rule);
case TS_FNAME_PARENT_PROXY: /* parent.config */
return parentParse(rule);
case TS_FNAME_VOLUME: /* volume.config */
@@ -247,16 +243,6 @@ Rule::parse(const char *const_rule, TSFi
/**
- * admin_accessParse
- **/
-TokenList *
-Rule::admin_accessParse(char *rule)
-{
- return icpParse(rule, 3, 3);
-}
-
-
-/**
* arm_securityParse
**/
TokenList *
@@ -513,16 +499,6 @@ Rule::logs_xmlParse(char *rule)
/**
- * mgmt_allowParse
- **/
-TokenList *
-Rule::mgmt_allowParse(char *rule)
-{
- return cacheParse(rule, 2, 2);
-}
-
-
-/**
* parentParse
**/
TokenList *
@@ -966,9 +942,7 @@ RuleList::parse(char *fileBuf, const cha
{
m_filename = xstrdup(filename);
- if (strstr(filename, "admin_access.config")) {
- m_filetype = TS_FNAME_ADMIN_ACCESS; /* admin_access.config */
- } else if (strstr(filename, "cache.config")) {
+ if (strstr(filename, "cache.config")) {
m_filetype = TS_FNAME_CACHE_OBJ; /* cache.config */
} else if (strstr(filename, "congestion.config")) {
m_filetype = TS_FNAME_CONGESTION; /* congestion.config */
@@ -980,8 +954,6 @@ RuleList::parse(char *fileBuf, const cha
m_filetype = TS_FNAME_IP_ALLOW; /* ip_allow.config */
} else if (strstr(filename, "logs_xml.config")) {
m_filetype = TS_FNAME_LOGS_XML; /* logs_xml.config */
- } else if (strstr(filename, "mgmt_allow.config")) {
- m_filetype = TS_FNAME_MGMT_ALLOW; /* mgmt_allow.config */
} else if (strstr(filename, "parent.config")) {
m_filetype = TS_FNAME_PARENT_PROXY; /* parent.config */
} else if (strstr(filename, "volume.config")) {
Modified: trafficserver/traffic/trunk/mgmt/api/GenericParser.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/GenericParser.h?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/GenericParser.h (original)
+++ trafficserver/traffic/trunk/mgmt/api/GenericParser.h Sun Apr 3 18:34:48 2011
@@ -201,12 +201,10 @@ private:
TokenList *splitdnsParse(char *rule);
TokenList *updateParse(char *rule);
TokenList *vaddrsParse(char *rule);
- TokenList *admin_accessParse(char *rule);
TokenList *arm_securityParse(char *rule);
TokenList *hostingParse(char *rule);
TokenList *ip_allowParse(char *rule);
TokenList *logs_xmlParse(char *rule);
- TokenList *mgmt_allowParse(char *rule);
TokenList *volumeParse(char *rule);
TokenList *logsParse(char *rule);
TokenList *pluginParse(char *rule);
Modified: trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc (original)
+++ trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc Sun Apr 3 18:34:48 2011
@@ -935,41 +935,6 @@ TSPdSsFormatDestroy(TSPdSsFormat * ele)
}
/*-------------------------------------------------------------
- * TSAdminAccessEle
- *-------------------------------------------------------------*/
-tsapi TSAdminAccessEle *
-TSAdminAccessEleCreate()
-{
- TSAdminAccessEle *ele;
-
- ele = (TSAdminAccessEle *) xmalloc(sizeof(TSAdminAccessEle));
- if (!ele)
- return NULL;
-
- ele->cfg_ele.type = TS_ADMIN_ACCESS;
- ele->cfg_ele.error = TS_ERR_OKAY;
- ele->user = NULL;
- ele->password = NULL;
- ele->access = TS_ACCESS_UNDEFINED;
-
- return ele;
-}
-
-tsapi void
-TSAdminAccessEleDestroy(TSAdminAccessEle * ele)
-{
- if (ele) {
- if (ele->user)
- xfree(ele->user);
- if (ele->password)
- xfree(ele->password);
- xfree(ele);
- }
- return;
-}
-
-
-/*-------------------------------------------------------------
* CacheObj
*-------------------------------------------------------------*/
tsapi TSCacheEle *
@@ -1297,40 +1262,6 @@ TSLogObjectEleDestroy(TSLogObjectEle * e
}
/*-------------------------------------------------------------
- * TSMgmtAllowEle
- *-------------------------------------------------------------*/
-tsapi TSMgmtAllowEle *
-TSMgmtAllowEleCreate()
-{
-
- TSMgmtAllowEle *ele;
-
- ele = (TSMgmtAllowEle *) xmalloc(sizeof(TSMgmtAllowEle));
- if (!ele)
- return NULL;
-
- ele->cfg_ele.type = TS_MGMT_ALLOW;
- ele->cfg_ele.error = TS_ERR_OKAY;
- ele->src_ip_addr = TS_INVALID_IP_ADDR;
- ele->action = TS_MGMT_ALLOW_UNDEFINED;
-
- return ele;
-}
-
-tsapi void
-TSMgmtAllowEleDestroy(TSMgmtAllowEle * ele)
-{
- if (ele) {
- if (ele->src_ip_addr)
- TSIpAddrEleDestroy(ele->src_ip_addr);
- xfree(ele);
- }
- return;
-
-}
-
-
-/*-------------------------------------------------------------
* TSParentProxyEleCreate
*-------------------------------------------------------------*/
tsapi TSParentProxyEle *
Modified: trafficserver/traffic/trunk/mgmt/api/include/mgmtapi.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/include/mgmtapi.h?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/include/mgmtapi.h (original)
+++ trafficserver/traffic/trunk/mgmt/api/include/mgmtapi.h Sun Apr 3 18:34:48 2011
@@ -308,14 +308,6 @@ extern "C"
TS_LOG_MODE_UNDEFINED
} TSLogModeT;
- /* TODO: This should be removed */
- typedef enum /* access privileges to news articles cached by Traffic Server */
- {
- TS_MGMT_ALLOW_ALLOW,
- TS_MGMT_ALLOW_DENY,
- TS_MGMT_ALLOW_UNDEFINED
- } TSMgmtAllowT;
-
typedef enum /* methods of specifying groups of clients */
{
TS_CLIENT_GRP_IP, /* ip range */
@@ -380,14 +372,12 @@ extern "C"
typedef enum
{
- TS_FNAME_ADMIN_ACCESS, /* admin_access.config */
TS_FNAME_CACHE_OBJ, /* cache.config */
TS_FNAME_CONGESTION, /* congestion.config */
TS_FNAME_HOSTING, /* hosting.config */
TS_FNAME_ICP_PEER, /* icp.config */
TS_FNAME_IP_ALLOW, /* ip_allow.config */
TS_FNAME_LOGS_XML, /* logs_xml.config */
- TS_FNAME_MGMT_ALLOW, /* mgmt_allow.config */
TS_FNAME_PARENT_PROXY, /* parent.config */
TS_FNAME_VOLUME, /* volume.config */
TS_FNAME_PLUGIN, /* plugin.config */
@@ -410,7 +400,6 @@ extern "C"
*/
typedef enum
{
- TS_ADMIN_ACCESS, /* admin_access.config */
TS_CACHE_NEVER, /* cache.config */
TS_CACHE_IGNORE_NO_CACHE,
TS_CACHE_IGNORE_CLIENT_NO_CACHE,
@@ -426,7 +415,6 @@ extern "C"
TS_LOG_FILTER, /* logs_xml.config */
TS_LOG_OBJECT,
TS_LOG_FORMAT,
- TS_MGMT_ALLOW, /* mgmt_allow.config */
TS_PP_PARENT, /* parent.config */
TS_PP_GO_DIRECT,
TS_VOLUME, /* volume.config */
@@ -582,15 +570,6 @@ extern "C"
TSError error;
} TSCfgEle;
-/* admin_access.config */
- typedef struct
- {
- TSCfgEle cfg_ele;
- char *user; /* username */
- char *password; /* MD5 encrypted */
- TSAccessT access; /* type of access allowed for user */
- } TSAdminAccessEle;
-
/* cache.config */
typedef struct
{
@@ -687,14 +666,6 @@ extern "C"
TSStringList server_hosts; /* list of host names */
} TSLogObjectEle;
-/* mgmt_allow.config */
- typedef struct
- {
- TSCfgEle cfg_ele;
- TSIpAddrEle *src_ip_addr; /* source ip address (single or range) */
- TSMgmtAllowT action;
- } TSMgmtAllowEle;
-
/* parent.config */
typedef struct
{
@@ -926,8 +897,6 @@ extern "C"
tsapi void TSSspecDestroy(TSSspec * ele);
tsapi TSPdSsFormat *TSPdSsFormatCreate();
tsapi void TSPdSsFormatDestroy(TSPdSsFormat * ele);
- tsapi TSAdminAccessEle *TSAdminAccessEleCreate();
- tsapi void TSAdminAccessEleDestroy(TSAdminAccessEle * ele);
tsapi TSCacheEle *TSCacheEleCreate(TSRuleTypeT type);
tsapi void TSCacheEleDestroy(TSCacheEle * ele);
tsapi TSCongestionEle *TSCongestionEleCreate();
@@ -944,8 +913,6 @@ extern "C"
tsapi void TSLogFormatEleDestroy(TSLogFormatEle * ele);
tsapi TSLogObjectEle *TSLogObjectEleCreate();
tsapi void TSLogObjectEleDestroy(TSLogObjectEle * ele);
- tsapi TSMgmtAllowEle *TSMgmtAllowEleCreate();
- tsapi void TSMgmtAllowEleDestroy(TSMgmtAllowEle * ele);
tsapi TSParentProxyEle *TSParentProxyEleCreate(TSRuleTypeT type);
tsapi void TSParentProxyEleDestroy(TSParentProxyEle * ele);
tsapi TSVolumeEle *TSVolumeEleCreate();
Modified: trafficserver/traffic/trunk/mgmt/api/remote/APITestCliRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/remote/APITestCliRemote.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/remote/APITestCliRemote.cc (original)
+++ trafficserver/traffic/trunk/mgmt/api/remote/APITestCliRemote.cc Sun Apr 3 18:34:48 2011
@@ -368,43 +368,6 @@ print_pd_sspec(TSPdSsFormat info)
}
-//
-// Ele printing functions
-//
-
-void
-print_admin_access_ele(TSAdminAccessEle * ele)
-{
- if (!ele) {
- fprintf(stderr, "print_admin_access_ele: ele is NULL\n");
- return;
- }
-
- char accessType;
- switch (ele->access) {
- case TS_ACCESS_NONE:
- accessType = '0';
- break;
- case TS_ACCESS_MONITOR:
- accessType = '1';
- break;
- case TS_ACCESS_MONITOR_VIEW:
- accessType = '2';
- break;
- case TS_ACCESS_MONITOR_CHANGE:
- accessType = '3';
- break;
- default:
- accessType = '?'; /* lv: to make gcc happy and don't brake fprintf */
- // Handled here:
- // TS_ACCESS_UNDEFINED
- break;
- }
-
- fprintf(stderr, "%s:%s:%c:\n", ele->user, ele->password, accessType);
- return;
-}
-
void
print_cache_ele(TSCacheEle * ele)
{
@@ -543,16 +506,6 @@ print_ip_allow_ele(TSIpAllowEle * ele)
}
void
-print_mgmt_allow_ele(TSMgmtAllowEle * ele)
-{
- if (!ele) {
- printf("can't print ele\n");
- }
-
- print_ip_addr_ele(ele->src_ip_addr);
-}
-
-void
print_parent_ele(TSParentProxyEle * ele)
{
if (!ele) {
@@ -841,9 +794,6 @@ print_ele_list(TSFileNameT file, TSCfgCo
ele = TSCfgContextGetEleAt(ctx, i);
switch (filename) {
- case TS_FNAME_ADMIN_ACCESS:
- print_admin_access_ele((TSAdminAccessEle *) ele);
- break;
case TS_FNAME_CACHE_OBJ:
print_cache_ele((TSCacheEle *) ele);
break;
@@ -858,9 +808,6 @@ print_ele_list(TSFileNameT file, TSCfgCo
break;
case TS_FNAME_LOGS_XML:
break; /*NOT DONE */
- case TS_FNAME_MGMT_ALLOW:
- print_mgmt_allow_ele((TSMgmtAllowEle *) ele);
- break;
case TS_FNAME_PARENT_PROXY:
print_parent_ele((TSParentProxyEle *) ele);
break;
@@ -1600,9 +1547,7 @@ test_cfg_context_get(char *args)
name[strlen(filename) - 1] = '\0';
// convert file name to TSFileNameT
- if (strcmp(name, "admin_access.config") == 0) {
- file = TS_FNAME_ADMIN_ACCESS;
- } else if (strcmp(name, "cache.config") == 0) {
+ if (strcmp(name, "cache.config") == 0) {
file = TS_FNAME_CACHE_OBJ;
} else if (strcmp(name, "congestion.config") == 0) {
file = TS_FNAME_CONGESTION;
@@ -1614,8 +1559,6 @@ test_cfg_context_get(char *args)
file = TS_FNAME_IP_ALLOW;
} else if (strcmp(name, "logs_xml.config") == 0) {
file = TS_FNAME_LOGS_XML;
- } else if (strcmp(name, "mgmt_allow.config") == 0) {
- file = TS_FNAME_MGMT_ALLOW;
} else if (strcmp(name, "parent.config") == 0) {
file = TS_FNAME_PARENT_PROXY;
} else if (strcmp(name, "volume.config") == 0) {
@@ -1676,9 +1619,7 @@ test_cfg_context_move(char *args)
name[strlen(filename) - 1] = '\0';
// convert file name to TSFileNameT
- if (strcmp(name, "admin_access.config") == 0) {
- file = TS_FNAME_ADMIN_ACCESS;
- } else if (strcmp(name, "cache.config") == 0) {
+ if (strcmp(name, "cache.config") == 0) {
file = TS_FNAME_CACHE_OBJ;
} else if (strcmp(name, "congestion.config") == 0) {
file = TS_FNAME_CONGESTION;
@@ -1690,8 +1631,6 @@ test_cfg_context_move(char *args)
file = TS_FNAME_IP_ALLOW;
} else if (strcmp(name, "logs_xml.config") == 0) {
file = TS_FNAME_LOGS_XML;
- } else if (strcmp(name, "mgmt_allow.config") == 0) {
- file = TS_FNAME_MGMT_ALLOW;
} else if (strcmp(name, "parent.config") == 0) {
file = TS_FNAME_PARENT_PROXY;
} else if (strcmp(name, "volume.config") == 0) {
Modified: trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc Sun Apr 3 18:34:48 2011
@@ -80,42 +80,13 @@ u_getch(void)
return returned;
}
-int
-cliVerifyPasswd(char *passwd)
-{
- char *e_passwd = NULL;
- TSError status = TS_ERR_OKAY;
- TSString old_passwd = NULL;
-
- TSEncryptPassword(passwd, &e_passwd);
- status = Cli_RecordGetString("proxy.config.admin.admin_password", &old_passwd);
-
- if (status != TS_ERR_OKAY) {
- if (e_passwd)
- xfree(e_passwd);
- return CLI_ERROR;
- }
- if (e_passwd) {
- if (strcmp((char *) old_passwd, e_passwd)) {
- xfree(e_passwd);
- return CLI_ERROR;
- }
- xfree(e_passwd);
- } else {
-
- return CLI_ERROR;
-
- }
-
-
- return CLI_OK;
-}
-
////////////////////////////////////////////////////////////////
// Cmd_Enable
//
// This is the callback
// function for the "enable" command.
+// TODO: This currently doesn't do anything, these commands are
+// always available.
//
// Parameters:
// clientData -- information about parsed arguments
@@ -165,27 +136,10 @@ Cmd_Enable(ClientData clientData, Tcl_In
Cli_Printf("Already Enabled\n");
return CMD_OK;
}
- // TODO: Use here some proper getpass function
- // See APR's apr_password_get
- char passwd[256], ch = 'p';
- int i = 0;
- printf("Password:");
- fflush(stdout);
- ch = u_getch();
- while (ch != '\n' && ch != '\r') {
- passwd[i] = ch;
- i++;
- ch = u_getch();
- }
- passwd[i] = 0;
- if (cliVerifyPasswd(passwd) == CLI_ERROR) {
- Cli_Printf("\nIncorrect Password\n");
- return CMD_ERROR;
- }
- Cli_Printf("\n");
- enable_restricted_commands = TRUE;
- return CMD_OK;
+ // TODO: replace this assert with appropriate authentication
+ ink_release_assert(enable_restricted_commands);
+ return CMD_ERROR;
}
////////////////////////////////////////////////////////////////
@@ -778,7 +732,6 @@ Cmd_ConfigPorts(ClientData clientData, T
return (ConfigPortsSet(argtable[0].parsed_args, argtable[0].data));
break;
case CMD_CONFIG_PORTS_HTTP_SERVER:
- case CMD_CONFIG_PORTS_WEBUI:
case CMD_CONFIG_PORTS_CLUSTER:
case CMD_CONFIG_PORTS_CLUSTER_RS:
case CMD_CONFIG_PORTS_CLUSTER_MC:
@@ -806,8 +759,6 @@ CmdArgs_ConfigPorts()
(char *) NULL, CMD_CONFIG_PORTS_HTTP_SERVER, "Set Ports for http-server", (char *) NULL);
createArgument("http-other", 1, CLI_ARGV_OPTION_NAME_VALUE,
(char *) NULL, CMD_CONFIG_PORTS_HTTP_OTHER, "Set Ports for http-other", (char *) NULL);
- createArgument("webui", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_PORTS_WEBUI, "Set Ports for webui", (char *) NULL);
createArgument("cluster", 1, CLI_ARGV_OPTION_INT_VALUE,
(char *) NULL, CMD_CONFIG_PORTS_CLUSTER, "Set Ports for cluster", (char *) NULL);
createArgument("cluster-rs", 1, CLI_ARGV_OPTION_INT_VALUE,
@@ -947,12 +898,6 @@ Cmd_ConfigSecurity(ClientData clientData
case CMD_CONFIG_SECURITY_IP:
return (Cli_ConfigFileURL_Action(TS_FNAME_IP_ALLOW, "ip_allow.config", argtable->arg_string));
- case CMD_CONFIG_SECURITY_MGMT:
- return (Cli_ConfigFileURL_Action(TS_FNAME_MGMT_ALLOW, "mgmt_allow.config", argtable->arg_string));
-
- case CMD_CONFIG_SECURITY_ADMIN:
- return (Cli_ConfigFileURL_Action(TS_FNAME_ADMIN_ACCESS, "admin_access.config", argtable->arg_string));
-
case CMD_CONFIG_SECURITY_PASSWORD:
return (ConfigSecurityPasswd());
}
@@ -971,11 +916,6 @@ CmdArgs_ConfigSecurity()
{
createArgument("ip-allow", 1, CLI_ARGV_OPTION_NAME_VALUE,
(char *) NULL, CMD_CONFIG_SECURITY_IP, "Clients allowed to connect to proxy <url>", (char *) NULL);
- createArgument("mgmt-allow", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_SECURITY_MGMT, "Clients allowed to connect to manager <url>", (char *) NULL);
- createArgument("admin", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_SECURITY_ADMIN, "Administrator access to WebUI <url>", (char *) NULL);
-
createArgument("password", 1, CLI_ARGV_CONSTANT,
(char *) NULL, CMD_CONFIG_SECURITY_PASSWORD, "Change Admin Password", (char *) NULL);
return 0;
@@ -2523,9 +2463,6 @@ ConfigPortsSet(int arg_ref, void *valueP
case CMD_CONFIG_PORTS_HTTP_OTHER:
status = Cli_RecordSetString("proxy.config.http.server_other_ports", (TSString) valuePtr, &action_need);
break;
- case CMD_CONFIG_PORTS_WEBUI:
- status = Cli_RecordSetInt("proxy.config.admin.web_interface_port", *(TSInt *) valuePtr, &action_need);
- break;
case CMD_CONFIG_PORTS_CLUSTER:
status = Cli_RecordSetInt("proxy.config.cluster.cluster_port", *(TSInt *) valuePtr, &action_need);
break;
@@ -2585,13 +2522,6 @@ ConfigPortsGet(int arg_ref)
Cli_Printf("none\n");
}
break;
- case CMD_CONFIG_PORTS_WEBUI:
- status = Cli_RecordGetInt("proxy.config.admin.web_interface_port", &int_val);
- if (status) {
- return status;
- }
- Cli_Printf("%d\n", int_val);
- break;
case CMD_CONFIG_PORTS_CLUSTER:
status = Cli_RecordGetInt("proxy.config.cluster.cluster_port", &int_val);
if (status) {
@@ -2650,75 +2580,9 @@ ConfigPortsGet(int arg_ref)
int
ConfigSecurityPasswd()
{
- char org_passwd[256], new_passwd1[256], new_passwd2[256], ch = 'p';
- int i = 0;
- char *e_passwd = NULL;
- TSError status = TS_ERR_OKAY;
- TSActionNeedT action_need = TS_ACTION_UNDEFINED;
-
Cli_Debug("ConfigSecurityPasswd\n");
-
- Cli_Printf("Enter Old Password:");
- fflush(stdout);
- ch = u_getch();
- while (ch != '\n' && ch != '\r') {
- org_passwd[i] = ch;
- i++;
- ch = u_getch();
-
- }
- org_passwd[i] = 0;
-
- if (cliVerifyPasswd(org_passwd) == CLI_ERROR) {
- Cli_Printf("\nIncorrect Password\n");
- return CLI_ERROR;
- }
-
- Cli_Printf("\nEnter New Password:");
- fflush(stdout);
- i = 0;
- ch = u_getch();
- while (ch != '\n' && ch != '\r') {
- new_passwd1[i] = ch;
- i++;
- ch = u_getch();
-
- }
- new_passwd1[i] = 0;
-
- Cli_Printf("\nReEnter New Password:");
- fflush(stdout);
- i = 0;
- ch = u_getch();
- while (ch != '\n' && ch != '\r') {
- new_passwd2[i] = ch;
- i++;
- ch = u_getch();
-
- }
- new_passwd2[i] = 0;
-
- if (strcmp(new_passwd1, new_passwd2)) {
- Cli_Printf("\nTwo New Passwords Aren't Same\n");
- return CLI_ERROR;
- }
-
- TSEncryptPassword(new_passwd1, &e_passwd);
- status = Cli_RecordSetString("proxy.config.admin.admin_password", (TSString) e_passwd, &action_need);
-
- if (status != TS_ERR_OKAY) {
- Cli_Printf("\nCannot Set The Password\n");
- Cli_ConfigEnactChanges(action_need);
- if (e_passwd)
- xfree(e_passwd);
- return CLI_ERROR;
- }
-
- Cli_Printf("\nPassword Set\n");
- if (e_passwd)
- xfree(e_passwd);
+ Cli_Printf("This command is currently a no-op");
return CLI_OK;
-
}
// config remap sub-command
Modified: trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.h?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.h (original)
+++ trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.h Sun Apr 3 18:34:48 2011
@@ -49,7 +49,6 @@ typedef enum
CMD_CONFIG_PORTS,
CMD_CONFIG_PORTS_HTTP_SERVER,
CMD_CONFIG_PORTS_HTTP_OTHER,
- CMD_CONFIG_PORTS_WEBUI,
CMD_CONFIG_PORTS_CLUSTER,
CMD_CONFIG_PORTS_CLUSTER_RS,
CMD_CONFIG_PORTS_CLUSTER_MC,
@@ -105,8 +104,6 @@ typedef enum
CMD_CONFIG_FILTER,
CMD_CONFIG_SECURITY,
CMD_CONFIG_SECURITY_IP,
- CMD_CONFIG_SECURITY_MGMT,
- CMD_CONFIG_SECURITY_ADMIN,
CMD_CONFIG_SECURITY_PASSWORD,
CMD_CONFIG_PARENTS_STATUS,
CMD_CONFIG_PARENTS_CACHE,
@@ -754,7 +751,6 @@ int Cmd_Enable(ClientData clientData, Tc
int CmdArgs_Enable();
int cliCheckIfEnabled(char *command);
-int cliVerifyPasswd(char *passwd);
////////////////////////////////////////////////////////////////
// Cmd_Disable
Modified: trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc Sun Apr 3 18:34:48 2011
@@ -1224,7 +1224,6 @@ ShowPorts()
{
TSInt http_server = -1;
TSString http_other = NULL;
- TSInt web_interface = -1;
TSInt cluster = -1;
TSInt cluster_rs = -1;
TSInt cluster_mc = -1;
@@ -1236,7 +1235,6 @@ ShowPorts()
Cli_RecordGetInt("proxy.config.http.server_port", &http_server);
Cli_RecordGetString("proxy.config.http.server_other_ports", &http_other);
- Cli_RecordGetInt("proxy.config.admin.web_interface_port", &web_interface);
Cli_RecordGetInt("proxy.config.cluster.cluster_port", &cluster);
Cli_RecordGetInt("proxy.config.cluster.rsport", &cluster_rs);
Cli_RecordGetInt("proxy.config.cluster.mcport", &cluster_mc);
@@ -1248,7 +1246,6 @@ ShowPorts()
Cli_Printf("\n");
Cli_Printf("HTTP Server Port ------- %d\n", http_server);
Cli_Printf("HTTP Other Ports ------- %s\n", (http_other != NULL) ? http_other : "none");
- Cli_Printf("Web Interface Port ----- %d\n", web_interface);
Cli_Printf("Cluster Port ----------- %d\n", cluster);
Cli_Printf("Cluster RS Port -------- %d\n", cluster_rs);
Cli_Printf("Cluster MC Port -------- %d\n", cluster_mc);
@@ -1285,24 +1282,10 @@ ShowCluster()
int
ShowSecurity()
{
- TSInt web_interface = -1;
-
- Cli_Printf("\n");
- Cli_RecordGetInt("proxy.config.admin.web_interface_port", &web_interface);
-
- Cli_Printf("Web Interface Port ----- %d\n", web_interface);
Cli_Printf("\n");
Cli_Printf("Traffic Server Access\n" "-------------------\n");
TSError status = Cli_DisplayRules(TS_FNAME_IP_ALLOW);
- if (status) {
- return status;
- }
-
- Cli_Printf("\n");
- Cli_Printf("Traffic Manager Access\n" "-------------------\n");
- status = Cli_DisplayRules(TS_FNAME_MGMT_ALLOW);
-
return status;
}
Modified: trafficserver/traffic/trunk/mgmt/cli/cli_detailed_command_list.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/cli_detailed_command_list.txt?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/cli_detailed_command_list.txt (original)
+++ trafficserver/traffic/trunk/mgmt/cli/cli_detailed_command_list.txt Sun Apr 3 18:34:48 2011
@@ -327,18 +327,13 @@ security Security Configuration (only i
ts> show:security
- Web Interface Port ----- 12 (proxy.config.admin.web_interface_port)
-
Traffic Server Access
(ip_allow.config contents)
- Traffic Manager Access
- (mgmt_allow.config contents)
ts>
implementation:
Traffic Server Access specified in ip_allow.config (use MGMT API)
- Traffic Manager Access specified in mgmt_allow.config (use MGMT API)
cluster Cluster Configuration
@@ -1365,25 +1360,8 @@ security Security Configuration
ts# config:security ip-allow http://example.com/ip_allow.config
ts#
- syntax: config:security mgmt-allow <url>
-
- ts# config:security mgmt-allow http://example.com/mgmt_allow.config
- ts#
-
syntax: config:security admin <url>
- ts# config:security admin http://example.com/admin_access.config
- ts#
-
-parent Parent Configuration
- (on/off, parents, rules)
- syntax: config:parent status <on | off>
- config:parent name <parent>
- config:parent rules <url>
- args: <on | off> = proxy.config.http.parent_proxy_routing_enable
- <parent> = proxy.config.http.parent_proxies
- <url> = retrieve file and use as parent.config
-
ts# config:parent status on
ts#
@@ -1409,7 +1387,6 @@ ports Ports used by Traffic Server
args: some variables are single-port while other can be a list of ports
<http-server> (proxy.config.http.server_port) single
<http-other> (proxy.config.http.server_other_ports) list
- <webui> (proxy.config.admin.web_interface_port) single
<cluster> (proxy.config.cluster_port) single
<cluster-rs> (proxy.config.cluster.rsport) single
<cluster-mc> (proxy.config.cluster.mcport) single
Modified: trafficserver/traffic/trunk/mgmt/cli/script_configs.sh
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/script_configs.sh?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/script_configs.sh (original)
+++ trafficserver/traffic/trunk/mgmt/cli/script_configs.sh Sun Apr 3 18:34:48 2011
@@ -62,7 +62,7 @@ export TS_CONFIG_SECONDARY_MTPT="/mnt/ts
export SYSTEM_CONFIG_FILES="/etc/resolv.conf /etc/hosts ${NETWORK_P2FILE} ${NETWORK_PARMSFILE}"
-export TS_CONFIG_FILES="storage.config socks.config proxy.pac vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
+export TS_CONFIG_FILES="storage.config socks.config proxy.pac vaddrs.config cache.config icp.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
export FLOPPY_DEVICE="/dev/fd0"
Modified: trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc (original)
+++ trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc Sun Apr 3 18:34:48 2011
@@ -831,7 +831,6 @@ Config_RestoreNetConfig(char *file)
}
// Get Admin GUI encrypted password.
- char *e_gui_passwd;
TSActionNeedT action_need, top_action_req = TS_ACTION_UNDEFINED;
char *mail_address = netXml.getXmlTagValue("MailAddress");
if (mail_address != NULL) {
@@ -844,24 +843,7 @@ Config_RestoreNetConfig(char *file)
}
xfree(mail_address);
}
- //Admin GUI passwd setting
- char *gui_passwd = netXml.getXmlTagValue("AdminGUIPasswd");
- if (gui_passwd != NULL) {
- if (TSEncryptPassword(gui_passwd, &e_gui_passwd) != TS_ERR_OKAY) {
- DPRINTF(("Config_FloppyNetRestore: failed to encrypt passwd %s!\n", gui_passwd));
- } else {
- if (MgmtRecordSet("proxy.config.admin.admin_password", e_gui_passwd, &action_need) != TS_ERR_OKAY) {
- DPRINTF(("Config_FloppyNetRestore: failed to set new passwd %s!\n", gui_passwd));
- } else {
- if (action_need < top_action_req) // a more "severe" action is needed...
- top_action_req = action_need;
- DPRINTF(("Config_FloppyNetRestore: set new passwd %s!\n", gui_passwd));
- }
- }
- xfree(gui_passwd);
- if (e_gui_passwd)
- xfree(e_gui_passwd);
- }
+
// Make sure this is the last entry in these series. We restart traffic server here and hence
// should be done at the very end.
TagValue = netXml.getXmlTagValue("TimeZone");
Modified: trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc Sun Apr 3 18:34:48 2011
@@ -743,42 +743,6 @@ varType(const char *varName)
return data_type;
}
-// void computeXactMax()
-//
-// Compute the maximum numder of transactions
-// for the machine based on the number of processors
-// and the load_factor
-//
-// Store the result into a node var so that
-// it gets passed around the cluster
-//
-void
-computeXactMax()
-{
- int numCPU = 0;
- RecFloat loadFactor = 0;
- RecInt maxXact = 0;
- int err = REC_ERR_FAIL;
-
- numCPU = ink_number_of_processors();
- err = RecGetRecordFloat("proxy.config.admin.load_factor", &loadFactor);
-
- if (err == REC_ERR_OKAY || loadFactor < 20.0) {
- mgmt_log(stderr, "[computeXactMax] Invalid Or Missing proxy.config.admin.load_factor. Using default\n");
- loadFactor = 43.0;
- }
- // The formula is: the first cpu counts as 1 and each subsequent CPU counts
- // as .5
- if (numCPU > 1) {
- numCPU--;
- maxXact = (MgmtInt) (loadFactor * (1.0 + (numCPU * .5)));
- } else {
- maxXact = (MgmtInt) (loadFactor * 1);
- }
-
- ink_assert(varSetInt("proxy.node.xact_scale", maxXact));
-}
-
// InkHashTable* processFormSubmission(char* submission)
//
@@ -792,7 +756,6 @@ computeXactMax()
InkHashTable *
processFormSubmission(char *submission)
{
-
InkHashTable *nameVal = ink_hash_table_create(InkHashTableKeyType_String);
Tokenizer updates("&\n\r");
Tokenizer pair("=");
Modified: trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.h?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.h (original)
+++ trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.h Sun Apr 3 18:34:48 2011
@@ -103,7 +103,6 @@ bool ProxyShutdown();
int processSpawn(const char *args[], EnvBlock * env, textBuffer * input_buf, textBuffer * output_buf, bool nowait,
bool runAsRoot, bool * truncated = NULL);
-void computeXactMax();
int setHostnameVar();
void appendDefaultDomain(char *hostname, int bufLength);
Modified: trafficserver/traffic/trunk/mgmt/web2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/Makefile.am?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/web2/Makefile.am Sun Apr 3 18:34:48 2011
@@ -34,33 +34,20 @@ DEFS += $(MGMT_DEFS)
noinst_LIBRARIES = libweb.a
libweb_a_SOURCES = \
- MgmtAllow.cc \
- MgmtAllow.h \
- MgmtRaf.h \
WebCompatibility.cc \
WebCompatibility.h \
- WebConfigRender.cc \
- WebConfigRender.h \
WebGlobals.h \
- WebHttpAuth.cc \
- WebHttpAuth.h \
WebHttp.cc \
WebHttp.h \
WebHttpContext.cc \
WebHttpContext.h \
- WebHttpLog.cc \
- WebHttpLog.h \
WebHttpMessage.cc \
WebHttpMessage.h \
- WebHttpRender.cc \
- WebHttpRender.h \
WebHttpSession.cc \
WebHttpSession.h \
WebIntrMain.cc \
WebIntrMain.h \
WebOverview.cc \
WebOverview.h \
- WebReconfig.cc \
- WebReconfig.h \
WebUtils.cc \
WebUtils.h
Modified: trafficserver/traffic/trunk/mgmt/web2/WebGlobals.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebGlobals.h?rev=1088371&r1=1088370&r2=1088371&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebGlobals.h (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebGlobals.h Sun Apr 3 18:34:48 2011
@@ -45,11 +45,9 @@
#include "ink_mutex.h"
#include "MgmtHashTable.h"
-#include "WebHttpAuth.h"
extern "C"
{
- struct ssl_ctx_st;
struct sockaddr_in;
}
@@ -57,11 +55,7 @@ extern "C"
enum UIthr_t
{
NO_THR = 0,
- HTTP_THR,
- GRAPH_THR,
- CLI_THR,
- AUTOCONF_THR,
- OVERSEER_THR
+ AUTOCONF_THR
};
struct serviceThr_t
@@ -97,14 +91,6 @@ struct WebContext
const char *defaultFile;
char *docRoot;
int docRootLen;
- int adminAuthEnabled;
- WebHttpAuthUser admin_user; // admin user (always available)
- MgmtHashTable *other_users_ht; // other users (can change dynamically)
- MgmtHashTable *lang_dict_ht; // language dictionary (tag to string)
- int SSLenabled;
- int AdvUIEnabled; /* 0=Simple UI, 1=Full UI, 2=RNI UI */
- int FeatureSet; /* bit field of features */
- ssl_ctx_st *SSL_Context;
};
struct WebInterFaceGlobals
@@ -117,25 +103,13 @@ struct WebInterFaceGlobals
ink_sem serviceThrCount;
#endif
serviceThr_t *serviceThrArray;
- int webPort;
- ink_thread_key tmpFile; // used by WebFileEdit.cc
- ink_thread_key requestTSD;
- int logFD;
- bool logResolve;
- int refreshRate;
};
extern WebInterFaceGlobals wGlobals;
-extern WebContext adminContext;
extern WebContext autoconfContext;
#define MAX_SERVICE_THREADS 100
-#define MAX_VAR_LENGTH 256
-#define MAX_VAL_LENGTH 512
-#define MAX_PASSWD 32
#define FILE_NAME_MAX 255
-#define MAX_CHECKSUM_LENGTH 32
-#define REFRESH_RATE_MRTG 300
//-------------------------------------------------------------------------
// web2 items
@@ -151,7 +125,6 @@ extern WebContext autoconfContext;
#define WEB_HTTP_SERVER_STATE_WIN32 0x01
#define WEB_HTTP_SERVER_STATE_UNIX 0x02
#define WEB_HTTP_SERVER_STATE_AUTH_ENABLED 0x08
-#define WEB_HTTP_SERVER_STATE_SSL_ENABLED 0x10
#define WEB_HTTP_SERVER_STATE_AUTOCONF 0x20
#define WEB_HTTP_STATE_CONFIGURE 0x01 // MONITOR if bit is 0