Skip to content

Commit 5ef454a

Browse files
committed
v0.1.9 - removed service principal + windows detection
1 parent f2c22cf commit 5ef454a

File tree

5 files changed

+10
-19
lines changed

5 files changed

+10
-19
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "HBase",
3-
"version": "0.1.8",
4-
"versionDate": "2018-12-20",
3+
"version": "0.1.9",
4+
"versionDate": "2019-01-17",
55
"author": "hackolade",
66
"engines": {
77
"hackolade": "2.3.2",

reverse_engineering/api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ function setAuthData(options, connectionInfo){
436436
if (connectionInfo.auth === 'kerberos') {
437437
authParams.krb5 = {
438438
principal: connectionInfo.principal,
439-
service_principal: connectionInfo.service_principal,
439+
service_principal: 'HTTP' + (process.platform === 'win32' ? '/' : '@') + connectionInfo.host,
440440
password: connectionInfo.password
441441
};
442442
}

reverse_engineering/connection_settings_modal/connectionSettingsModalConfig.json

-10
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,6 @@
6161
"value": "kerberos"
6262
},
6363
"isHiddenKey": true
64-
},
65-
{
66-
"inputLabel": "Service principal",
67-
"inputKeyword": "service_principal",
68-
"inputType": "text",
69-
"inputPlaceholder": "HTTP@{fqdn}",
70-
"dependency": {
71-
"key": "auth",
72-
"value": "kerberos"
73-
}
7464
}
7565
]
7666
}

reverse_engineering/kerberosService.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11

2-
const getTokenFromKerberos = (kerberos, service, user, password) => {
2+
const getTokenFromKerberos = (kerberos, service, principal, password) => {
33
const mechOID = kerberos.GSS_MECH_OID_SPNEGO;
4+
const [ user, domain ] = principal.split('@');
45

56
return kerberos.initializeClient(service, {
6-
user, password, mechOID
7+
user, domain, password, mechOID
78
}).then(client => {
89
return client.step('');
910
});
1011
};
1112

12-
const getClient = kerberos => ({ principal: user, service_principal: service, password }) => Promise.resolve({
13+
const getClient = kerberos => ({ principal, service_principal: service, password }) => Promise.resolve({
1314
token: (callback) => {
14-
getTokenFromKerberos(kerberos, service, user, password).then(
15+
getTokenFromKerberos(kerberos, service, principal, password).then(
1516
(token) => callback(null, token),
1617
err => callback(err)
1718
);

reverse_engineering/node_modules/node-fetch/package.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)