[pbs-devel] [PATCH proxmox-backup] unbreak get_subscription without sshd installed

[pbs-devel] [PATCH proxmox-backup] unbreak get_subscription without sshd installed

[Fabian Grünbichler]

which might be the case e.g. in a PBS container

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

Notes:
    we might want to switch to a different file as base? or even generate a file
    just for the server ID derivation?

 src/api2/node/subscription.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api2/node/subscription.rs b/src/api2/node/subscription.rs
index 67797fd5..010a0209 100644
--- a/src/api2/node/subscription.rs
+++ b/src/api2/node/subscription.rs
@@ -94,7 +94,7 @@ pub fn get_subscription(
         Ok(None) => SubscriptionInfo {
             status: SubscriptionStatus::NOTFOUND,
             message: Some("There is no subscription key".into()),
-            serverid: Some(tools::get_hardware_address()?),
+            serverid: tools::get_hardware_address().ok(),
             url:  Some(url.into()),
             ..Default::default()
         },
-- 
2.20.1

Re: [pbs-devel] [PATCH proxmox-backup] unbreak get_subscription without sshd installed

[Dietmar Maurer]

Or make sure sshd is installed?

> On 11/10/2020 4:59 PM Fabian Grünbichler <f.gruenbichler@proxmox.com> wrote:
> 
>  
> which might be the case e.g. in a PBS container
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
> 
> Notes:
>     we might want to switch to a different file as base? or even generate a file
>     just for the server ID derivation?
> 
>  src/api2/node/subscription.rs | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/api2/node/subscription.rs b/src/api2/node/subscription.rs
> index 67797fd5..010a0209 100644
> --- a/src/api2/node/subscription.rs
> +++ b/src/api2/node/subscription.rs
> @@ -94,7 +94,7 @@ pub fn get_subscription(
>          Ok(None) => SubscriptionInfo {
>              status: SubscriptionStatus::NOTFOUND,
>              message: Some("There is no subscription key".into()),
> -            serverid: Some(tools::get_hardware_address()?),
> +            serverid: tools::get_hardware_address().ok(),
>              url:  Some(url.into()),
>              ..Default::default()
>          },
> -- 
> 2.20.1
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

Re: [pbs-devel] [PATCH proxmox-backup] unbreak get_subscription without sshd installed

[Fabian Grünbichler]

> Dietmar Maurer <dietmar@proxmox.com> hat am 10.11.2020 17:01 geschrieben:
> 
>  
> Or make sure sshd is installed?

we don't require it for any functionality (except deriving the server ID, which can be done with any arbitrary somewhat static, server-specific file)

> > On 11/10/2020 4:59 PM Fabian Grünbichler <f.gruenbichler@proxmox.com> wrote:
> > 
> >  
> > which might be the case e.g. in a PBS container
> > 
> > Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> > ---
> > 
> > Notes:
> >     we might want to switch to a different file as base? or even generate a file
> >     just for the server ID derivation?
> > 
> >  src/api2/node/subscription.rs | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/src/api2/node/subscription.rs b/src/api2/node/subscription.rs
> > index 67797fd5..010a0209 100644
> > --- a/src/api2/node/subscription.rs
> > +++ b/src/api2/node/subscription.rs
> > @@ -94,7 +94,7 @@ pub fn get_subscription(
> >          Ok(None) => SubscriptionInfo {
> >              status: SubscriptionStatus::NOTFOUND,
> >              message: Some("There is no subscription key".into()),
> > -            serverid: Some(tools::get_hardware_address()?),
> > +            serverid: tools::get_hardware_address().ok(),
> >              url:  Some(url.into()),
> >              ..Default::default()
> >          },
> > -- 
> > 2.20.1
> > 
> > 
> > 
> > _______________________________________________
> > pbs-devel mailing list
> > pbs-devel@lists.proxmox.com
> > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

Re: [pbs-devel] [PATCH proxmox-backup] unbreak get_subscription without sshd installed

[Thomas Lamprecht]

On 10.11.20 16:59, Fabian Grünbichler wrote:
> which might be the case e.g. in a PBS container
> 

rather breaks it further, as in, one cannot use subscriptions at all
anymore...

> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
> 
> Notes:
>     we might want to switch to a different file as base? or even generate a file
>     just for the server ID derivation?

using the openssh-server one has quite some advantages, be it only to
avoid tampering. I'd for now suggest adding the diff below to the meta
package - we can see if another option makes more sense for the next
major release.

btw, a specific container meta package like PMG has, without the kernel
dependencies could make sense to add.

----8<----
diff --git a/debian/control b/debian/control
index e88b965..d961da0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
 Package: proxmox-backup
 Architecture: all
 Depends: libc6,
+         openssh-server,
          proxmox-archive-keyring,
          proxmox-backup-client,
          proxmox-backup-server,
--

Re: [pbs-devel] [PATCH proxmox-backup] unbreak get_subscription without sshd installed

[Fabian Grünbichler]

> Thomas Lamprecht <t.lamprecht@proxmox.com> hat am 10.11.2020 17:54 geschrieben:
> 
>  
> On 10.11.20 16:59, Fabian Grünbichler wrote:
> > which might be the case e.g. in a PBS container
> > 
> 
> rather breaks it further, as in, one cannot use subscriptions at all
> anymore...

not sure how, this patch just changes the GET for when no subscription and no ssh host key is available?

it does not fix setting/checking subscriptions for the subscription but no sshd case, but it does not break anything further AFAICT?
> 
> > Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> > ---
> > 
> > Notes:
> >     we might want to switch to a different file as base? or even generate a file
> >     just for the server ID derivation?
> 
> using the openssh-server one has quite some advantages, be it only to
> avoid tampering. I'd for now suggest adding the diff below to the meta
> package - we can see if another option makes more sense for the next
> major release.

I still disagree with adding openssh-server as dep just for this (and I don't see how this prevents tampering in any way - the host key path is configurable on the sshd side?), but I can live with it (I can just touch the file and still not install openssh-server after all :-P)

> btw, a specific container meta package like PMG has, without the kernel
> dependencies could make sense to add.

I just installed proxmox-backup-server + proxmox-archive-keyring for that so far, with no problems except this one which seems to be a recent addition ;)

> ----8<----
> diff --git a/debian/control b/debian/control
> index e88b965..d961da0 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -7,6 +7,7 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
>  Package: proxmox-backup
>  Architecture: all
>  Depends: libc6,
> +         openssh-server,
>           proxmox-archive-keyring,
>           proxmox-backup-client,
>           proxmox-backup-server,
> --