From 1a1c13d4d7dc1d5ed3416062773d668315ce7ff5 Mon Sep 17 00:00:00 2001 From: james pickett Date: Mon, 12 Sep 2022 07:14:02 -0700 Subject: [PATCH 1/4] adds different icon and debug menu to desktop for non prod --- cmd/launcher/desktop/desktop.go | 24 ++++++++++++++++++ cmd/launcher/desktop/icon.go | 9 +++++-- cmd/launcher/desktop/icon_windows.go | 9 +++++-- cmd/launcher/desktop/kolide-non-prod-icon.png | Bin 0 -> 6398 bytes ...rk-only-white.png => kolide-prod-icon.png} | Bin .../desktop/kolide-windows-non-prod-icon.ico | Bin 0 -> 5430 bytes ...x-32x.ico => kolide-windows-prod-icon.ico} | Bin cmd/launcher/launcher.go | 2 +- ee/desktop/runtime/runner.go | 6 ++++- ee/desktop/runtime/runner_darwin.go | 2 +- ee/desktop/runtime/runner_test.go | 2 +- ee/desktop/runtime/runner_windows.go | 2 +- 12 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 cmd/launcher/desktop/kolide-non-prod-icon.png rename cmd/launcher/desktop/{kolide-mark-only-white.png => kolide-prod-icon.png} (100%) create mode 100644 cmd/launcher/desktop/kolide-windows-non-prod-icon.ico rename cmd/launcher/desktop/{kolide-mark-only-purple-16x-32x.ico => kolide-windows-prod-icon.ico} (100%) diff --git a/cmd/launcher/desktop/desktop.go b/cmd/launcher/desktop/desktop.go index 931430f29..7df6337b6 100644 --- a/cmd/launcher/desktop/desktop.go +++ b/cmd/launcher/desktop/desktop.go @@ -2,6 +2,7 @@ package desktop import ( "context" + "flag" "fmt" "os" "os/signal" @@ -18,12 +19,35 @@ func RunDesktop(args []string) error { go exitWhenParentGone() go handleSignals() + flagset := flag.NewFlagSet("launcher desktop", flag.ExitOnError) + var ( + flhostname = flagset.String( + "hostname", + "", + "hostname launcher is connected to", + ) + ) + if err := flagset.Parse(args); err != nil { + return err + } + onReady := func() { systray.SetTemplateIcon(kolideDesktopIcon, kolideDesktopIcon) systray.SetTooltip("Kolide") versionItem := systray.AddMenuItem(fmt.Sprintf("Version %s", version.Version().Version), "") versionItem.Disable() + + // if prod environment, return + if *flhostname == "k2device-preprod.kolide.com" || *flhostname == "k2device.kolide.com" { + return + } + + // in non prod environment + systray.SetTemplateIcon(kolideDesktopIconNonProd, kolideDesktopIconNonProd) + systray.AddSeparator() + systray.AddMenuItem("--- DEBUG ---", "").Disable() + systray.AddMenuItem(fmt.Sprintf("Hostname: %s", *flhostname), "").Disable() } systray.Run(onReady, func() {}) diff --git a/cmd/launcher/desktop/icon.go b/cmd/launcher/desktop/icon.go index 9d53b6e14..ead0828d7 100644 --- a/cmd/launcher/desktop/icon.go +++ b/cmd/launcher/desktop/icon.go @@ -7,5 +7,10 @@ import ( _ "embed" ) -//go:embed kolide-mark-only-white.png -var kolideDesktopIcon []byte +var ( + //go:embed kolide-prod-icon.png + kolideDesktopIcon []byte + + //go:embed kolide-non-prod-icon.png + kolideDesktopIconNonProd []byte +) diff --git a/cmd/launcher/desktop/icon_windows.go b/cmd/launcher/desktop/icon_windows.go index 53a6e77cf..4d1bf765c 100644 --- a/cmd/launcher/desktop/icon_windows.go +++ b/cmd/launcher/desktop/icon_windows.go @@ -7,5 +7,10 @@ import ( _ "embed" ) -//go:embed kolide-mark-only-purple-16x-32x.ico -var kolideDesktopIcon []byte +var ( + //go:embed kolide-windows-prod-icon.ico + kolideDesktopIcon []byte + + //go:embed kolide-windows-non-prod-icon.ico + kolideDesktopIconNonProd []byte +) diff --git a/cmd/launcher/desktop/kolide-non-prod-icon.png b/cmd/launcher/desktop/kolide-non-prod-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d7d896883faaff049ad76274bb06abfb7f4901b GIT binary patch literal 6398 zcmdT}hc{f&w-$^}7=)1^qGS++(OZZC$oON%^6Fm)DDmE%2A|hHXO;rOTq8oG9 zHw6iSfl}#}5}KMPI!0=Q_UixD)sX3#OGsMQ+d$8dh!Sv?(44ea!LTJ-bS(9o*-g;6 z&SoHX)ysS-@~0-v*o$Bld^ktXlg50yYLJdUcXpb>T>G=u`zXf^)oLOlmNqR_Wh4Jz zo6~UyY|8Wz^W5KisWgeWq4(%TS(%MSSzrIX;C#T_(Opaw_Ao7P`||mG)l|gRG$^z7 zinTlHrkaUM?vCE6uCyBT0+tpcODUB);usu*bwnQXI4CYyPKgWPn*u z`P0>gCDrNl#%x^SCEZh}Q-G=Im0~%zxaggS?$|U|=;^(0e>!o~XH>aCVL5U;$V1D| z?qOFY$P=tvS2(~`*{A9PpjXi9;`j%CEM%VB>eBtn0e+EH!V_jGCI4az*G12&;jpvI zw%zjE70wBPGP0T3^{$H?k{QxQ?l^?GVlVMTi@no%k6~c6ypQq(snSTit*| zT(|Qm`713h$)SHwFN!Dj?9C*!Ak_8AI3FMhPF@bq+lmRI)jOYsVRW8wuqIDo9Q zQ6%u8z7HI+lJB#+y}?Mn75wQ6W-yyUYgW=C;&>9sOC3BFY0h`*$zn3K+CvvFHk=`T zdWp`$oD;=u9xU_Hh>d2byyjNX4(=ML?l6J-TF2L5XCeBD8yk4FX(x_+btxFG`vGRen0|@q1H=5nbc=+>jNR+qY@w?36I9JBFR1SS`(zj%5 zD{;IlK)ad6UvB)1f`9*uZo{VK5tzC)MmfztctZ$XF#i4lo*fLVax07+i}&M?D z#BUi_e}=>Y->Wxa$mPsb;!wFtajj-_P_v#;l=ugg_KkhIac`({YOc&}R_(&@`e_&) zdnri$Jj4ih3JvGb`zURH-$7i+dEv`@)-%oL?HKze=wXz}DK{=Uc*D?nHP_(IU5_xY z^P|3Kr_=(?bCRgCeJqtE-`_0zUq8VYW2W82>2+^X6xI137QAA-nnOJ<3W_)A53q9% zcUR^DDylmo;au>)X%$TOrfgG*Sy1k=rJ3aE+Y@0Hzf1@3;Ij>ieBy^un9s;piTr8?fdv4JaxWbpZ|v^tX0IXW?dXD4 zE@cMdH>I70cf+G^GBN+iySl0tuD|)qMy!zMk6iVm_aDE}_U3l|DJ)axUpPrSBy|9j zDM&zvkoLjkreHD&38*@5(9k-Ze>2WaG7MF%bS47`|NvE`xnO5VXqk%|azTFZ9-=w(A|a<)dqM zs#Eu%FWFN>f6`8T2r`5|r|LRddg_t{FZAyGG>9j?speCz&abV_)7#MbmY=#2GNicd zw*iTM)7JxhT4=Xp`Zzp?rJfR52uQYTRJ%ojKQbwr0Gpqs?V7@Gd4047#1Im4WqCxD zIsgMcD@q!5+kmp1GHpSs6KhQ%0`a1;qNNSkBK-SHsC~^q6`ET`3)vNTGjg;Tc||2Bmb#oFpNAvWU%AwL zo`4c>v2%^~@4mO6z?`0h+9NEKR@xv zJNg&bTNL!$S)vWBp`n~Q;}!5%6n=yAk^I0eSJwLg<~?rVQjT$85KHq{pmAYp z(QKP>NT@#oAGNJ<)poHZaoHi5PZ`*v=bd2SiS+tmd9x!mkkfo$grnjjW2!!*yq7cQ zQ)J{@gbZW|xF2|$8^&9oJ~#N-F~Pt9neVy_YC63!T|jZW?$||sVWgK6>K!fYJUB14 zxu|XQssdvVm;m!G_yw(CDe!?$cO{@P$IV$pt4g#@)e_c%}fK->bmx@um?Wa9-O zTLLswg7jwtJVM_-nUj*z=+;>p#Z!NTo%U3%2%>!KcU+&@D6pMBx4ErTG;1ze0UIWG zg#l{!>Q1{M80d4IG;}6gF+~f%^KR47bYI(F{a2HsIEC{lx)yE7_Ys>!!Bhl+U^!-C zM_y#d#2nsB-hDjbv|WWRhYinXn71#~Q){_Uzm(n1|8%>pyxq+&R9f9S{B>%S5l+Db zwvfTzo+P7l*pJSunx_|hvHLxK_EX0NS`UxT90xn@-u~W3^({sNE;ZUl-!ix${q9J2y4Bf9;& zjzi?$8;h^F+fc=PTT`@zXD(7(vs?tKNfEadsUW2itv zl(kljrFuE2>+;Yn%3@XfFlS>D{!y;WX+LlHjqN?xZ zxWY!GEzBtJJq*reCu=1>0TuIVC2&0}oY)rBx$%?im00Rp2FHWdBE^d)WuZTv2R*T4 zRD$@aNd>15cSl4>GE*eZLw|KuqwJHBQ!|}ZACr{DM#~~0$;f~kw%eb`Fk2R8UB#L$ zCV%fb12P$zf^pXvIum=KEh$!QHQWtCkNS$Dmpb-5D0-)Hk2L6KRyB$-(?iKTzSfIJDS1bl(d2WvFVF$F@hNLS>JO!$`5Q_IjB~Ih zAls();5e#@1m_$7GW9c4EY>7!NOOJ}U2P!iOm&i| zZC$LzoO~YxT3_)<;fgXOzyyQ*y~eV@+tf0Ds03v^m%elq$WH2XTGN|6H(*e>$RB*v zRnM10DKoS7;#ulBE<(lB=HlaA4_B0zwY_t~Fhs&b=G3Nh{;64)Y=KOXuwH(1)tfv0 z5ot}PzWwwAUC%B@CLT{y3xd9htpr8v9?5J<3+~bqmc5^$E1d0QsgI8Z2c=_(=}qAw z$#dOulWb%)=@hlJS{t5p`U#`$LcxzKI!>z{FM~JD z%(~<>_*7ihtNBAFd<4)-HwvT+kcmP!bDCDlRjloG5{B8ISq*Wt#$GCavtDlC+e zLO9^x@h$w=lklG2iuXO3I2p&CMcAF2Xk%9VnfmpPh9OTlt$GF53QFECq_(x=egA3D z<2$-3etf*cDR^e6x8YNqDv~~j>*F&Qjl3u~;O&dl-kA|-kjhb=LF=3tOQ@?@czM1U zFPP#H)c*Qtd1mJ?Lq2fa<{lhKr4jbz@vc6OF?&VwVK$?D<~yylIq* zl!Mjb3NA<2&_43zx;ej9%+~3rNxDi#;pgw}YDv4q<3xR=T0DO1gh@nJ(7_)DI5XQSOnhjfu2ELgfAMIvVU9 zX1h{3>bg|nCw>3oKE}8z$?Q-{<+vkKgs_t|`wcYIo-BNYp{{slshod^6khB(;_JpL zusnj4`(P(QDrb{oMG8kN73Gjj8YSZI+xzXaJ(cI-Od6+|#~)X8aAn7BL0YD6fZ^*x$}=r29GZ=`V$F zdVE^tB%kb@BRs?XG(%z&XVsu?86sWc{37Klqn@s3-G-<@gGaV z#^CukumM@~_hy_j$iUc+46Kgdlf~bSTtAGJ+!YaD7sow92(*S)E1dwW)=?Hqx*yW; z4*cfJt;pWyIk!1dHiue%{~x5bkY0{Lqv6j)ywdybI3o*B z{g?r{@`u)^lRUtFAGH5ucoFwWa*d3UuwnyG9YK#-oQ=y(m<&u?$UZodk*4I#n{kQP zvziI>HoMOP;sU)|8SiHPreR6*38+D;LUHAn~X z&$t(n8p5ilzjpu)o{t1bDf-7~;QXPD={Mvk^=iZ}1ZU*1Mu_9#i1ZKdNK5@C6wGQu z!e7=XX0r00joeAz<)3P1%*~!BiGdYJ_lZh2Ykm$1kLmqqfQ(0dA}!UV33)>retSNw z9XthfkNvh5hbFodxQ7Vu?{vnfEjV48E6q-R)&B zJSghp(hvW@kXUqUH34*}piT*Ws1=J%nIzV=i)36_(v1PeKbIx*q!v#AUGm7N$7qJ* zg_2|%0kS_jcUXDBSaG*)T`WLWt!v{y$UBvkC z<$)>z4P17Bl_~j73wFWZl-zo&8$_W`!edPATRMdY`CrX+fMHtI+r;4!EUWp5$&qVS zqf!~mHfrzK*i5Fi$n_vOH&m0NMFtN!YaOz# zb=N4;;qO27xl1!oiKzmEG&HKuiCx?xTVms3>+d1Yy-DSsyf-{JkAsB+bu_A}0jH&) zL!s+Q;KB+stuk@X+FWN2+*A$IgY7*~Ut`cBSoD~#OBDQXH&=q2P}Q}YA#hVO?29;# z*5i6)eoEgWCClvj#INaGsaDYNXZ(cfIDQaHFX5TYBEA@*31loJ<;_gBa-brVCUqU7 zMd@3rR0=);{Y#%r@P9xQRh_N`ZI#-86nH0#iCt_XC!kZ)waE{#(N-B$bqS!# zxY+ADw5tsPzuIUXf!|>IS-5$yb)?^o-`D2MV^B~|0cSW6W8S1CM( z(ig4dAc=F~UE{L|JKj*TvX)ywIvzKAR@&VK`y#SB!GZ)&+l8m2C;hK;h5yBOP3u;_ zXDxnntP}9rOTbKa;I`-1_#40vFl`Lyn5$nu;WQ}&_RVI%ir!Kdg_11H94z-gdRi_| z;@Nj(O8NtA9Q~SSTn?G1nJ2XbBnzjGg}s^{p7{3R-3!(XJlTRj*%IOrtuVj(TKIA6 zF7*uZ)(^ zswy?#!eraFPixB3=NarMZm&zd`3YuErYv2jZL>{H>;^vqeOhW8T1xWdO{V4+xmhhjLjko*wdd{q{N8_iSQ(XO( znC;7Cpx&>E^;zD3;cJ2M(YBM+B|9E@{w8~&Yk_Fyh<8#CNI`X3m+SE46B zlD4#ToX%`7nY?gg_hFyw=y#pDyCYJZyQzhf3MFpH^cMe8-?+7$kM1WIVSjBLGBGD{ zN^Xnf|XtAhD| zTjinuJ@L(AOd16^s;|sx2y)eTha=Qag0n!(2lfb~!HEi_H6ry-MivYS|Jc?G{w4w` z49A#=3wf0Cf31R9A(*BKHf2H#;D2ILXa5hed}RCx;=Hrbha?67(I{ZZtB)NPLMLYaW-p{f?Yv1*L5rlP7 z1U_$O>0eed1|#c?D5@GbB#7c?R+|Zo*k(3pO|Uba&~0lX#0bKc5i^<(PGcoD(nZz; zbFZnK>&Jh3f3*E_@p@jG@P@3c8bX2#hc%GJObjLyop{W?ug2QS&F|2$ARg*w&>Np% zPb88+7I&fHxf{MX;c$lN*z+Np-O2@RNbFJ7*dx$yEj@^o7wl^f2OB?5?8pu5yLxXI c9!b5k+WEq4s%KC5CqSg7rl(r@*ed+L07p`>A^-pY literal 0 HcmV?d00001 diff --git a/cmd/launcher/desktop/kolide-mark-only-white.png b/cmd/launcher/desktop/kolide-prod-icon.png similarity index 100% rename from cmd/launcher/desktop/kolide-mark-only-white.png rename to cmd/launcher/desktop/kolide-prod-icon.png diff --git a/cmd/launcher/desktop/kolide-windows-non-prod-icon.ico b/cmd/launcher/desktop/kolide-windows-non-prod-icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c96b1ef4131ce3896f6342e8575d04da8106e2bc GIT binary patch literal 5430 zcmcJTdx%v<7{JfpS-7<|{B8gc+ zC564CvbREQr2P>Qnv{{6n`R_ETrG3UZEwHd@yzY)+55`sgWt|~zWHY6o0)HBb~lQ0 zQIDu!zlgFqx~69o4U3|vxq09BbJ!PPI}RHv9{cPRQG~q_DV0i5LLbUg;RbjWeuQ;! zGQ>Xi7j()391Y{)KKKB>hYm=~YCevK&~`Zb9C#D9Le?KsH?a@f4T6tSwVTjCPQF)B zZiDTh{yaPeAHp7RF6ToV1bGK#68sKRU?sc-L!c)Z^GNs!T#vh;6N0p&jDw9Z5sXvc z+h8;t1jeDbrpA?)Fs^Ydg~#DWSO~LV610PBR0Z=|1-IeLIYSFCZ=EskvTmui`hP z`!LSkkd@gOV*f53bnU}=8$%G+W+#~I!y((W{B0e$FYc}5n`7qbc`y)i5c_xLqo_3( zMa9s%cToN=bJjx(=-Wn{cIW`_nPxZ#ypLk>;`txMn3LF@+gUIJ-Uj!22iy$t8T~JY zr>}UAD9xc^a5;Dm-Gd*%JWER(AJ@Tt#X!3-UN7_`-~zZ4%-?O0&Idj#iaByUG!z4V zj@bhSzzCQQFTn=Lo;yqpN!1u=9p-ol`bjVuyyMnDrMnFCeo2=Y=pl?d1br^7hDv*g z`9Bk5DCYyZ>%6E&@9yt!nR?H?XE>W{X*ch@U%|H{E9Ru>4dkRWC!g?E{Hz zE2U>Y5AmLcvmU-Fn_w*j@qW()?+^NjYm?qT^JWGd3tvMm`GrdN@o?Cb zIGQ`|$s5VHg?Z+iG98@LDd5!+iaxlDHq45H2o=<(8=Wa0XqgO7FrkiBGSjbpJeWFMv7H zsQ5cfx8H%V)r;Xve0*!Jg;}r+?uM!G1T-2$I4|Y-2ZcWB#ehp${5vV02c>&p4E1Ce z4kI88*{!rLq1s+h9sgZ8PCq5__b#p{YjE(abQ?Equs)$y46{>ydGv>%o_N=n|Hes= znbq;D7sGaZjKQ;X5A1|m;`x{ialhH|Dt!lE%4+LipWgG9^~C$Zd!o`%Rc-nwREvS? zhGZ39-XT@Ts#al}gntvm+|W<8acbE^TgrbDgZH&>{~{OywT7r$XZr+W@E*(VyKn7g z@GYDL=fYv&`Ka4}BM$bH;2rMUZT@Wp&(=inU5|eUrmWj#snpU`>Wuo9TBAZ|6y@9a zcR>rSih*3AwRlvag?}QX%{l(Fz`r}84>bow`Qq4Oz9k>!TL;8_6xyR=p(EE)=*$%h ZMA5fYgqC=mrcztfRBDe#mOApKzW@ literal 0 HcmV?d00001 diff --git a/cmd/launcher/desktop/kolide-mark-only-purple-16x-32x.ico b/cmd/launcher/desktop/kolide-windows-prod-icon.ico similarity index 100% rename from cmd/launcher/desktop/kolide-mark-only-purple-16x-32x.ico rename to cmd/launcher/desktop/kolide-windows-prod-icon.ico diff --git a/cmd/launcher/launcher.go b/cmd/launcher/launcher.go index bdf8fda28..8e7c9c29b 100644 --- a/cmd/launcher/launcher.go +++ b/cmd/launcher/launcher.go @@ -195,7 +195,7 @@ func runLauncher(ctx context.Context, cancel func(), opts *launcher.Options) err var desktopRunner *desktopRuntime.DesktopUsersProcessesRunner if (opts.KolideServerURL == "k2device-preprod.kolide.com" || opts.KolideServerURL == "localhost:3443") && runtime.GOOS == "darwin" { - desktopRunner = desktopRuntime.New(logger, time.Second*5) + desktopRunner = desktopRuntime.New(logger, time.Second*5, opts.KolideServerURL) runGroup.Add(desktopRunner.Execute, desktopRunner.Interrupt) } diff --git a/ee/desktop/runtime/runner.go b/ee/desktop/runtime/runner.go index 382cfcac3..a06f7024a 100644 --- a/ee/desktop/runtime/runner.go +++ b/ee/desktop/runtime/runner.go @@ -31,6 +31,9 @@ type DesktopUsersProcessesRunner struct { // due to needing to build the binary to test as a result of some test harness weirdness. // See runner_test.go for more details. executablePath string + // hostname is the host that launcher is connecting to. It gets passed to the desktop process + // and is used to determine which icon to display + hostname string } // addProcessForUser adds process information to the internal tracking state @@ -64,7 +67,7 @@ type processRecord struct { } // New creates and returns a new DesktopUsersProcessesRunner runner and initializes all required fields -func New(logger log.Logger, executionInterval time.Duration) *DesktopUsersProcessesRunner { +func New(logger log.Logger, executionInterval time.Duration, hostname string) *DesktopUsersProcessesRunner { return &DesktopUsersProcessesRunner{ logger: logger, interrupt: make(chan struct{}), @@ -72,6 +75,7 @@ func New(logger log.Logger, executionInterval time.Duration) *DesktopUsersProces executionInterval: executionInterval, procsWg: &sync.WaitGroup{}, procsWgTimeout: time.Second * 5, + hostname: hostname, } } diff --git a/ee/desktop/runtime/runner_darwin.go b/ee/desktop/runtime/runner_darwin.go index ef24c69df..65e4bfcc4 100644 --- a/ee/desktop/runtime/runner_darwin.go +++ b/ee/desktop/runtime/runner_darwin.go @@ -47,7 +47,7 @@ func (r *DesktopUsersProcessesRunner) runConsoleUserDesktop() error { return fmt.Errorf("determining executable path: %w", err) } - proc, err := runAsUser(uid, executablePath, "desktop") + proc, err := runAsUser(uid, executablePath, "desktop", fmt.Sprintf("--hostname=%s", r.hostname)) if err != nil { return fmt.Errorf("running desktop: %w", err) } diff --git a/ee/desktop/runtime/runner_test.go b/ee/desktop/runtime/runner_test.go index fce3899c6..53abddf24 100644 --- a/ee/desktop/runtime/runner_test.go +++ b/ee/desktop/runtime/runner_test.go @@ -92,7 +92,7 @@ func TestDesktopUserProcessRunner_Execute(t *testing.T) { var logBytes threadSafeBuffer - r := New(log.NewLogfmtLogger(&logBytes), time.Second*1) + r := New(log.NewLogfmtLogger(&logBytes), time.Second*1, "some-where-over-the-rainbow.com") r.executablePath = executablePath if tt.setup != nil { diff --git a/ee/desktop/runtime/runner_windows.go b/ee/desktop/runtime/runner_windows.go index 1d343067b..5295a4a56 100644 --- a/ee/desktop/runtime/runner_windows.go +++ b/ee/desktop/runtime/runner_windows.go @@ -49,7 +49,7 @@ func (r *DesktopUsersProcessesRunner) runConsoleUserDesktop() error { } defer accessToken.Close() - proc, err := runWithAccessToken(accessToken, executablePath, "desktop") + proc, err := runWithAccessToken(accessToken, executablePath, "desktop", fmt.Sprintf("--hostname=%s", r.hostname)) if err != nil { return fmt.Errorf("running desktop: %w", err) } From 2a4db739719d862b4dfe1038fc1eb08b49c4caac Mon Sep 17 00:00:00 2001 From: james pickett Date: Mon, 12 Sep 2022 11:07:36 -0700 Subject: [PATCH 2/4] update to run desktop on non linux platforms --- cmd/launcher/launcher.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/launcher/launcher.go b/cmd/launcher/launcher.go index 8e7c9c29b..fa3241a00 100644 --- a/cmd/launcher/launcher.go +++ b/cmd/launcher/launcher.go @@ -194,7 +194,7 @@ func runLauncher(ctx context.Context, cancel func(), opts *launcher.Options) err } var desktopRunner *desktopRuntime.DesktopUsersProcessesRunner - if (opts.KolideServerURL == "k2device-preprod.kolide.com" || opts.KolideServerURL == "localhost:3443") && runtime.GOOS == "darwin" { + if (opts.KolideServerURL == "k2device-preprod.kolide.com" || opts.KolideServerURL == "localhost:3443") && runtime.GOOS != "linux" { desktopRunner = desktopRuntime.New(logger, time.Second*5, opts.KolideServerURL) runGroup.Add(desktopRunner.Execute, desktopRunner.Interrupt) } From 5b651cf51af87fc6d6e22e2549937d185c02cecb Mon Sep 17 00:00:00 2001 From: james pickett Date: Mon, 12 Sep 2022 12:04:56 -0700 Subject: [PATCH 3/4] addressed pr feedback --- ee/desktop/runtime/runner_darwin.go | 2 +- ee/desktop/runtime/runner_test.go | 2 +- ee/desktop/runtime/runner_windows.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ee/desktop/runtime/runner_darwin.go b/ee/desktop/runtime/runner_darwin.go index 65e4bfcc4..9770438d9 100644 --- a/ee/desktop/runtime/runner_darwin.go +++ b/ee/desktop/runtime/runner_darwin.go @@ -47,7 +47,7 @@ func (r *DesktopUsersProcessesRunner) runConsoleUserDesktop() error { return fmt.Errorf("determining executable path: %w", err) } - proc, err := runAsUser(uid, executablePath, "desktop", fmt.Sprintf("--hostname=%s", r.hostname)) + proc, err := runAsUser(uid, executablePath, "desktop", "--hostname", r.hostname) if err != nil { return fmt.Errorf("running desktop: %w", err) } diff --git a/ee/desktop/runtime/runner_test.go b/ee/desktop/runtime/runner_test.go index 53abddf24..ddd971eee 100644 --- a/ee/desktop/runtime/runner_test.go +++ b/ee/desktop/runtime/runner_test.go @@ -92,7 +92,7 @@ func TestDesktopUserProcessRunner_Execute(t *testing.T) { var logBytes threadSafeBuffer - r := New(log.NewLogfmtLogger(&logBytes), time.Second*1, "some-where-over-the-rainbow.com") + r := New(log.NewLogfmtLogger(&logBytes), time.Second*1, "some-where-over-the-rainbow.example.com") r.executablePath = executablePath if tt.setup != nil { diff --git a/ee/desktop/runtime/runner_windows.go b/ee/desktop/runtime/runner_windows.go index 5295a4a56..30ebe1103 100644 --- a/ee/desktop/runtime/runner_windows.go +++ b/ee/desktop/runtime/runner_windows.go @@ -49,7 +49,7 @@ func (r *DesktopUsersProcessesRunner) runConsoleUserDesktop() error { } defer accessToken.Close() - proc, err := runWithAccessToken(accessToken, executablePath, "desktop", fmt.Sprintf("--hostname=%s", r.hostname)) + proc, err := runWithAccessToken(accessToken, executablePath, "desktop", "--hostname", r.hostname)) if err != nil { return fmt.Errorf("running desktop: %w", err) } From 711bac7c95dafb475504a680600e75fc1b9c3920 Mon Sep 17 00:00:00 2001 From: james pickett Date: Mon, 12 Sep 2022 12:49:38 -0700 Subject: [PATCH 4/4] fix syntax typo --- ee/desktop/runtime/runner_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/desktop/runtime/runner_windows.go b/ee/desktop/runtime/runner_windows.go index 30ebe1103..b1a61294f 100644 --- a/ee/desktop/runtime/runner_windows.go +++ b/ee/desktop/runtime/runner_windows.go @@ -49,7 +49,7 @@ func (r *DesktopUsersProcessesRunner) runConsoleUserDesktop() error { } defer accessToken.Close() - proc, err := runWithAccessToken(accessToken, executablePath, "desktop", "--hostname", r.hostname)) + proc, err := runWithAccessToken(accessToken, executablePath, "desktop", "--hostname", r.hostname) if err != nil { return fmt.Errorf("running desktop: %w", err) }