Skip to content
This repository was archived by the owner on Mar 28, 2022. It is now read-only.

Commit 3844a41

Browse files
flyinghermitflyinghermit
authored
Merge pull request #144 from seknox/v1.1.2-prep
v1.1.2 release prep
2 parents 3e93aff + aca7128 commit 3844a41

File tree

15 files changed

+53
-53
lines changed

15 files changed

+53
-53
lines changed

‎app/ios/trasa.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@
953953
CODE_SIGN_ENTITLEMENTS = trasa/trasa.entitlements;
954954
CODE_SIGN_IDENTITY = "Apple Development";
955955
CODE_SIGN_STYLE = Automatic;
956-
CURRENT_PROJECT_VERSION = 37;
956+
CURRENT_PROJECT_VERSION = 38;
957957
DEVELOPMENT_TEAM = QF253X5LF9;
958958
ENABLE_BITCODE = NO;
959959
INFOPLIST_FILE = trasa/Info.plist;
@@ -982,7 +982,7 @@
982982
CODE_SIGN_ENTITLEMENTS = trasa/trasa.entitlements;
983983
CODE_SIGN_IDENTITY = "Apple Development";
984984
CODE_SIGN_STYLE = Automatic;
985-
CURRENT_PROJECT_VERSION = 37;
985+
CURRENT_PROJECT_VERSION = 38;
986986
DEVELOPMENT_TEAM = QF253X5LF9;
987987
INFOPLIST_FILE = trasa/Info.plist;
988988
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

‎build/digital-ocean/etc/trasa/config/config.toml

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,41 @@
1-
21
[backup]
3-
backupdir = "$HOME/trasa/backup"
2+
backupdir = "/var/trasa/backup"
43

54
[database]
65
dbname = "trasadb"
6+
dbpass = "trasauser"
7+
dbtype = "postgres"
78
dbuser = "trasauser"
89
port = "5432"
910
server = "localhost"
10-
sslenabled = false
11-
1211

1312
[logging]
14-
level = "ERROR"
13+
level = "INFO"
1514

15+
[minio]
16+
key = "minioadmin"
17+
secret = "minioadmin"
18+
server = "127.0.0.1:9000"
19+
status = false
20+
usessl = false
1621

1722
[platform]
18-
base = "public"
23+
base = "private"
1924

20-
[redis]
21-
server = "redis:6379"
25+
[proxy]
26+
dblistenaddr = "127.0.0.1:3333"
27+
guacdaddr = "127.0.0.1:4822"
28+
guacdenabled = false
29+
sshlistenaddr = "127.0.0.1:8022"
2230

23-
[timezone]
24-
location = "Asia/Kathmandu"
31+
[redis]
32+
server = "localhost:6379"
2533

2634
[security]
27-
insecureSkipVerify=false
28-
29-
35+
insecureskipverify = true
3036

3137
[trasa]
32-
cloudServer = "https://u2fproxy.trasa.io"
33-
listenAddr = "<TRASA_LISTEN_ADDR>"
34-
autoCert = <AUTO_CERT>
35-
36-
37-
[sshproxy]
38-
listenAddr="0.0.0.0:8022"
39-
40-
[dbproxy]
41-
listenAddr="127.0.0.1:8023"
42-
43-
[vault]
44-
tsxvault = true
45-
38+
autocert = <AUTO_CERT>
39+
cloudserver = "https://sg.cpxy.trasa.io"
40+
listenaddr = "<TRASA_LISTEN_ADDR>"
41+
proxydashboard = false

‎build/digital-ocean/opt/seknox/first_login.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sudo systemctl stop trasa
55
echo "Enter TRASA server domain"
66
read trasadomain
77

8-
sudo sed -i -e 's|<TRASA_LISTEN_ADDR>|'$trasadomain'|g' /Users/bhrg3se/seknox/code/trasa/trasa-oss/build/etc/trasa/config/config.toml
8+
sudo sed -i -e 's|<TRASA_LISTEN_ADDR>|'$trasadomain'|g' /etc/trasa/config/config.toml
99

1010

1111

@@ -15,10 +15,16 @@ read ans
1515

1616

1717
if [ $ans = 'Y' ] || [ $ans = 'y' ]; then
18-
sudo sed -i -e 's|<AUTO_CERT>|true|g' /Users/bhrg3se/seknox/code/trasa/trasa-oss/build/etc/trasa/config/config.toml
18+
sudo sed -i -e 's|<AUTO_CERT>|true|g' /etc/trasa/config/config.toml
1919
fi
2020

21+
if [ $ans = 'N' ] || [ $ans = 'n' ]; then
22+
sudo sed -i -e 's|<AUTO_CERT>|false|g' /etc/trasa/config/config.toml
23+
fi
24+
25+
26+
2127

2228

2329
cp -f /etc/skel/.bashrc /root/.bashrc
24-
sudo systemctl start trasa
30+
sudo systemctl restart trasa

‎dashboard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "trasa-dashboard",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"config": {
55
"registry": "registry.gitlab.com/seknox/trasa/trasa-dashboard",
66
"variant": "onprem"

‎dashboard/src/pages/System/Settings/FCMConfig.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export default function TsxCloudProxyAccess(props: any) {
8484
const classes = useStyles();
8585
const [reqStatus, setReqStatus] = useState(false);
8686

87-
const [data, setData] = useState({ email: '', cpxy: '' });
87+
const [data, setData] = useState({ email: '', cpxy: 'https://sg.cpxy.trasa.io' });
8888
const [APIKey, setAPIKey] = useState('');
8989

9090
function handlechange(e: any) {

‎server/accessproxy/sshproxy/hostkeycallback.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func HandleHostKeyCallback(creds *models.UpstreamCreds, serviceID, orgID string,
4141
//If caKey from trasacore is invalid
4242
if caKey == nil {
4343
if confirmSkipVerify("Upstream Host provided a certificate which could not be verified. Do you want to skip the verification and save the key? \n") {
44-
logger.Debug(string(k.Marshal()))
44+
//logger.Debug(string(k.Marshal()))
4545
//TODO verify cert
4646
// put orgID
4747
err := services.Store.UpdateHostCert(string(ssh.MarshalAuthorizedKey(k)), serviceID, orgID)

‎server/accessproxy/sshproxy/session.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ func getClient(c ssh.ConnMetadata, signers []ssh.Signer) (*ssh.Client, error) {
294294
}
295295

296296
if len(signers) != 0 {
297-
logrus.Debug(signers)
297+
//logrus.Debug(signers)
298298
sess.clientConfig.Auth = append(sess.clientConfig.Auth, ssh.PublicKeys(signers...))
299299

300300
}

‎server/api/auth/serviceauth/db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func DBLogin(w http.ResponseWriter, r *http.Request) {
150150
}
151151

152152
utils.TrasaResponse(w, 200, "success", string(reason), "db-login", creds, policy.RecordSession, authlog.SessionID)
153-
logrus.Trace("Agent rlogin response returned")
153+
logrus.Trace("DB login response returned")
154154
return
155155

156156
}

‎server/api/auth/serviceauth/hHTTPSession.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ func sessionWriter(sessionID, shots string) {
330330
img, err := png.Decode(gopherPNG(counterAndImage[1]))
331331
if err != nil {
332332
if _, ok := err.(base64.CorruptInputError); ok {
333-
logger.Debug("\nbase64 input is corrupt, check service Key")
333+
logger.Debug("base64 input is corrupt, check service Key")
334334
}
335335
logger.Debug(err)
336336
//return
@@ -467,7 +467,7 @@ func logoutSequence(sessionID string) {
467467
logger.Error(err)
468468
}
469469
} else {
470-
logger.Tracef("Not deleting directory %s as video failed.\n", sessionID)
470+
logger.Tracef("Not deleting directory %s as video failed", sessionID)
471471
}
472472

473473
// we delete sessionvalur from sessionStore
@@ -503,7 +503,7 @@ func createVideo(path, sessionID string) error {
503503
cmd.Dir = path
504504
output, err := cmd.CombinedOutput()
505505
if err != nil {
506-
logger.Errorf("createVideo: %s : cmd.Run() failed with %v || %s\n", sessionID, err, string(output))
506+
logger.Errorf("createVideo: %s : cmd.Run() failed with %v || %s", sessionID, err, string(output))
507507
return err
508508
}
509509
//fmt.Printf("combined out:\n%s\n", string(out))

‎server/api/devices/hMobile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func GiveMeDeviceDetail(orguser, deviceID, totpSec string) {
158158
logrus.Error(err)
159159
return
160160
}
161-
logrus.Debug(orguser)
161+
//logrus.Debug(orguser)
162162
orgUserArray := strings.Split(orguser, ":")
163163

164164
if len(orgUserArray) != 2 {

‎server/api/notif/templateblobs.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3867,7 +3867,7 @@ We received password reset request from your account. Click the link below to ch
38673867
38683868
<td class="mcnTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;" valign="top">
38693869
3870-
<em>Copyright © 2018 - seknox cybersecurity, All rights reserved.</em><br>
3870+
<em>Copyright © 2020 - Seknox Cybersecurity, All rights reserved.</em><br>
38713871
<br>
38723872
<br>
38733873
<strong>Our mailing address is:</strong><br>
@@ -4816,7 +4816,7 @@ var AdhocReq string = `
48164816
48174817
<td class="mcnTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;" valign="top">
48184818
4819-
<em>Copyright © 2018 - seknox cybersecurity, All rights reserved.</em><br>
4819+
<em>Copyright © 2020 - Seknox Cybersecurity, All rights reserved.</em><br>
48204820
<br>
48214821
<br>
48224822
<strong>Our mailing address is:</strong><br>
@@ -5766,7 +5766,7 @@ var AdhocStatus string = `
57665766
57675767
<td class="mcnTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;" valign="top">
57685768
5769-
<em>Copyright © 2018 - seknox cybersecurity, All rights reserved.</em><br>
5769+
<em>Copyright © 2020 - Seknox Cybersecurity, All rights reserved.</em><br>
57705770
<br>
57715771
<br>
57725772
<strong>Our mailing address is:</strong><br>
@@ -6701,7 +6701,7 @@ var DynamicAccess string = `
67016701
67026702
<td class="mcnTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;" valign="top">
67036703
6704-
<em>Copyright © 2018 - seknox cybersecurity, All rights reserved.</em><br>
6704+
<em>Copyright © 2020 - Seknox Cybersecurity, All rights reserved.</em><br>
67056705
<br>
67066706
<br>
67076707
<strong>Our mailing address is:</strong><br>
@@ -7641,7 +7641,7 @@ h4{
76417641
76427642
<td class="mcnTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;" valign="top">
76437643
7644-
<em>Copyright © 2018 - seknox cybersecurity, All rights reserved.</em><br>
7644+
<em>Copyright © 2020 - Seknox Cybersecurity, All rights reserved.</em><br>
76457645
<br>
76467646
<br>
76477647
<strong>Our mailing address is:</strong><br>
@@ -7686,7 +7686,7 @@ [email protected]<br>
76867686
76877687
<td class="mcnTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;" valign="top">
76887688
7689-
<em>Copyright © 2018 - seknox cybersecurity, All rights reserved.</em><br>
7689+
<em>Copyright © 2020 - Seknox Cybersecurity, All rights reserved.</em><br>
76907690
<br>
76917691
<br>
76927692
<strong>Our mailing address is:</strong><br>

‎server/api/providers/vault/tsxvault/storetsxvault.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,15 +265,13 @@ func (s vaultStore) TsxVaultTester() error {
265265
secret.AddedAt = time.Now().Unix()
266266
secret.LastUpdated = time.Now().Unix()
267267

268-
logger.Debug(fmt.Sprintf("the plain text is: %s", string(secret.Secret)))
269268
// encrypt the secret.
270269
ct, err := utils.AESEncrypt(s.TsxvKey.Key[:], secret.Secret)
271270
if err != nil {
272271
logger.Error(err)
273272
return fmt.Errorf("failed to pass encryption test")
274273
}
275274

276-
logger.Debug(fmt.Sprintf("the cipher text is: %s", string(ct)))
277275
secret.Secret = ct
278276

279277
// store it in database

‎server/api/services/creds.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func GetUpstreamCreds(user, serviceID, serviceType, orgID string) (*models.Upstr
7676
//logrus.Debug(orgID, serviceID, "password", user)
7777
pass, err := tsxvault.Store.GetSecret(orgID, serviceID, "password", user)
7878
if err != nil {
79-
logrus.Error(err)
79+
logrus.Debug(err)
8080
resp.Password = ""
8181
} else {
8282
resp.Password = pass

‎server/api/services/hCreds.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func ViewCreds(w http.ResponseWriter, r *http.Request) {
9595

9696
service, err := Store.GetFromID(req.ServiceID)
9797
if err != nil {
98-
logrus.Error(err, "invalid service ID in view creds")
98+
//logrus.Error(err, "invalid service ID in view creds")
9999
logrus.Error(err)
100100
utils.TrasaResponse(w, 200, "failed", "Invalid service", "failed to view password")
101101
return

‎server/cert.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func generateCerts(certPath string, keyPath string, host string) error {
102102
}
103103
pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
104104
certOut.Close()
105-
logrus.Info("written cert.pem")
105+
logrus.Info("written tras-server.crt")
106106

107107
keyOut, err := os.OpenFile(keyPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
108108
if err != nil {
@@ -111,7 +111,7 @@ func generateCerts(certPath string, keyPath string, host string) error {
111111
}
112112
pem.Encode(keyOut, pemBlockForKey(priv))
113113
keyOut.Close()
114-
logrus.Info("written key.pem")
114+
logrus.Info("written trasa-server.key")
115115
return nil
116116
}
117117

0 commit comments

Comments
 (0)