Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup: Remove unused methods #123

Open
wants to merge 1 commit into
base: mainline
Choose a base branch
from
Open

cleanup: Remove unused methods #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 16 additions & 63 deletions auth/kerberos/src/krb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,34 +639,29 @@ std::pair<int, std::string> get_gmsa_krb_ticket( std::string domain_name,


std::string fqdn;
fqdn = retrieve_secret_from_ecs_config(domain_controller_gmsa);

if(fqdn.empty())
std::pair<int, std::vector<std::string>> domain_ips = get_domain_ips( domain_name );
if ( domain_ips.first != 0 )
{
std::pair<int, std::vector<std::string>> domain_ips = get_domain_ips( domain_name );
if ( domain_ips.first != 0 )
{
cf_logger.logger( LOG_ERR, "ERROR: Cannot resolve domain IPs of %s", __func__, __LINE__,
cf_logger.logger( LOG_ERR, "ERROR: Cannot resolve domain IPs of %s", __func__, __LINE__,
domain_name.c_str() );
std::cout << getCurrentTime() << '\t' << "ERROR: Cannot resolve domain IPs" <<
std::cout << getCurrentTime() << '\t' << "ERROR: Cannot resolve domain IPs" <<
std::endl;
return std::make_pair( -1, std::string( "" ) );
}
return std::make_pair( -1, std::string( "" ) );
}

for ( auto domain_ip : domain_ips.second )
{
auto fqdn_result = get_fqdn_from_domain_ip( domain_ip, domain_name );
if ( fqdn_result.first == 0 )
{
fqdn = fqdn_result.second;
break;
}
}
if ( fqdn.empty() )
for ( auto domain_ip : domain_ips.second )
{
auto fqdn_result = get_fqdn_from_domain_ip( domain_ip, domain_name );
if ( fqdn_result.first == 0 )
{
return std::make_pair( -1, std::string( "" ) );
fqdn = fqdn_result.second;
break;
}
}
if ( fqdn.empty() )
{
return std::make_pair( -1, std::string( "" ) );
}

/**
* ldapsearch -H ldap://<fqdn> -b 'CN=webapp01,CN=Managed Service
Expand Down Expand Up @@ -1122,48 +1117,6 @@ std::vector<std::string> delete_krb_tickets( std::string krb_files_dir, std::str
return delete_krb_ticket_paths;
}

std::string retrieve_secret_from_ecs_config(std::string ecs_variable_name)
{
const char* ecs_config_file_name = "/etc/ecs/ecs.config";

std::ifstream config_file( ecs_config_file_name );
std::string line;
std::vector<std::string> results;

while ( std::getline( config_file, line ) )
{
results = split_string(line, '=');

if(results.empty() || results.size() != 2)
{
std::cout << getCurrentTime() << '\t' << "invalid configuration format" << std::endl;
return "";
}

std::string key = results[0];
std::string value = results[1];
if ( !contains_invalid_characters_in_credentials(value) && ecs_variable_name.compare(key)==0 )
{
value.erase( std::remove( value.begin(), value.end(), '"' ), value.end() );

if( contains_invalid_characters_in_ad_account_name(value))
{
std::cout << getCurrentTime() << '\t' << "invalid domain controller name" <<
std::endl;
return "";
}
return value;
}
else{
std::cout << getCurrentTime() << '\t' << "invalid configuration provided, either "
"key/value is not in the correct format" <<
std::endl;
return "";
}
}
return "";
}

/**
* Given an input string split based on provided delimiter and return the split strings as vector
*
Expand Down
1 change: 0 additions & 1 deletion common/daemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ bool isValidDomain(const std::string& value);
int HealthCheck(std::string serviceName);

int parse_config_file( creds_fetcher::Daemon& cf_daemon );
std::string retrieve_secret_from_ecs_config(std::string ecs_variable_name);
std::vector<std::string> split_string(std::string input_string, char delimiter);

/**
Expand Down
2 changes: 0 additions & 2 deletions config/src/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ int parse_options( int argc, const char* argv[], creds_fetcher::Daemon& cf_daemo
return EXIT_FAILURE;
}
}
std::string aws_sm_secret_name = retrieve_secret_from_ecs_config(domainless_gmsa_field);
cf_daemon.aws_sm_secret_name = aws_sm_secret_name;
}
catch ( const std::exception& ex )
{
Expand Down
Loading