radcli 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3bc3f6acd5b2d491088f30d7fc6b679767134d23
-  data.tar.gz: a4a3cd61769cfbd15054d33bb07183fface522c9
+SHA256:
+  metadata.gz: 0662c80c5d2c83f379bc165a4aa43c122484e7dd57856d5e754593ab605b1b26
+  data.tar.gz: df4d73859a2c1e0b86c12071d2b2eec2f35177cf82fbe8ad0fd1c7b1bc403044
 SHA512:
-  metadata.gz: 3c339f77c1dc627b271112c1ba795e38544023ff3b063f84cf49d6b540b2580afc9962b6906517a0497141eee78d84da832a3d4b695a0b753c5f3fa60512cbf1
-  data.tar.gz: 78586e6958a05a42b38b35efb07af64f5fbf477af3eed0b67a8c9c06b245f9e3e02f2ef48c75b8ba2a1c4fc7ebae8208684473a4eaa30ca165413e85bb2afc3d
+  metadata.gz: 8bfd578c6e725d1c4e89e900ccbaab4866aa218ae821ae38af099e2933f8de44120356387fb6e836480f160eb0efe847a7532deb1903344d4cf4855e3747b82c
+  data.tar.gz: 9c99f9283ec6d273418d7e24f66cc3bb58eb54f3a12b2346e24f6d57ac8cd46fd79eb3c1d5c582eef2a55f3a3be90c6271c008b1a5acb3fe29d44aa4f00248ca

data/.devcontainer/Dockerfile

@@ -0,0 +1,19 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/ruby/.devcontainer/base.Dockerfile
+
+# [Choice] Ruby version: 2, 2.7, 2.6, 2.5
+ARG VARIANT="2"
+FROM mcr.microsoft.com/vscode/devcontainers/ruby:0-${VARIANT}
+
+# [Option] Install Node.js
+ARG INSTALL_NODE="true"
+ARG NODE_VERSION="lts/*"
+RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends make gcc automake autoconf xmlto xsltproc libkrb5-dev libldap2-dev libsasl2-dev
+
+# [Optional] Uncomment this line to install additional gems.
+RUN gem install rake bundler rake-compiler rspec
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

data/.devcontainer/devcontainer.json

@@ -0,0 +1,33 @@
+{
+	"name": "Ruby",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": { 
+			// Update 'VARIANT' to pick a Ruby version: 2, 2.7, 2.6, 2.5
+			"VARIANT": "2.7",
+			// Options
+			"INSTALL_NODE": "false",
+			"NODE_VERSION": "lts/*"
+		}
+	},
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"rebornix.Ruby"
+	],
+	
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "ruby --version",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+
+}

data/README.md

@@ -3,30 +3,47 @@ The radcli library provides a Ruby interface for performing actions on a Active
 (adcli: https://www.freedesktop.org/software/realmd/adcli/devel-building.html)
 
 # Installation
+This library is available as a gem.
 
+## Ubuntu 16.04
+```
+sudo apt-get -y install make gcc libkrb5-dev libldap2-dev libsasl2-dev
+sudo gem install radcli
+```
+## Redhat Linux 7.4
+``` 
+sudo yum -y install make gcc automake autoconf krb5-devel openldap-devel cyrus-sasl-devel cyrus-sasl-gssapi
+sudo gem install radcli
+```
+# Building
 
-### Prerequisites (Ubuntu)
+## Ubuntu 16.04 
 ```
 sudo apt-get install ruby gem ruby-dev
-sudo gem install rake bundler rakecompiler rspec
-sudo apt-get install automake autoconf xmlto xsltproc libkrb5-dev libldap2-dev libsasl2-dev
+sudo gem install rake bundler rake-compiler rspec
+sudo apt-get install make gcc automake autoconf xmlto xsltproc libkrb5-dev libldap2-dev libsasl2-dev
 ```
-
-### Prerequisites (Fedora)
 ```
-sudo yum ruby gem ruby-devel
-gem install rake bundler rakecompiler rspec
-sudo yum install automake autoconf xmlto xsltproc krb5-devel openldap-devel cyrus-sasl-devel
+git clone https://github.com/martencassel/radcli
+cd radcli
+rake build
+gem install pkg/radcli-1.1.0.gem
 ```
 
-### Building
+## Redhat Linux 7.4
+```
+sudo subscription-manager repos --enable rhel-7-server-optional-rpms
+sudo yum -y install ruby gem ruby-devel
+sudo yum -y install git make gcc automake autoconf krb5-devel openldap-devel cyrus-sasl-devel cyrus-sasl-gssapi
+sudo gem install rake bundler rake-compiler rspec
+```
 ```
 git clone https://github.com/martencassel/radcli
 cd radcli
 rake build
-gem install pkg/radcli-1.0.0.gem
+gem install pkg/radcli-1.1.0.gem
 ```
-
+  
 # Synposis
 
 ### Connect using username/password

data/ext/radcli/adconn.h

@@ -91,10 +91,15 @@ void                adcli_conn_set_domain_controller (adcli_conn *conn,
 
 const char *        adcli_conn_get_domain_short      (adcli_conn *conn);
 
+const char *        adcli_conn_get_domain_sid        (adcli_conn *conn);
+
 LDAP *              adcli_conn_get_ldap_connection   (adcli_conn *conn);
 
 krb5_context        adcli_conn_get_krb5_context      (adcli_conn *conn);
 
+void                adcli_conn_set_krb5_context      (adcli_conn *conn,
+                                                      krb5_context k5);
+
 const char *        adcli_conn_get_computer_name     (adcli_conn *conn);
 
 void                adcli_conn_set_computer_name     (adcli_conn *conn,
@@ -144,4 +149,6 @@ void                adcli_conn_set_krb5_conf_dir     (adcli_conn *conn,
 int                 adcli_conn_server_has_capability (adcli_conn *conn,
                                                       const char *capability);
 
+bool                adcli_conn_is_writeable          (adcli_conn *conn);
+
 #endif /* ADCONN_H_ */

data/ext/radcli/adenroll.h

@@ -30,6 +30,7 @@ typedef enum {
 	ADCLI_ENROLL_NO_KEYTAB = 1 << 1,
 	ADCLI_ENROLL_ALLOW_OVERWRITE = 1 << 2,
 	ADCLI_ENROLL_PASSWORD_VALID = 1 << 3,
+	ADCLI_ENROLL_ADD_SAMBA_DATA = 1 << 4,
 } adcli_enroll_flags;
 
 typedef struct _adcli_enroll adcli_enroll;
@@ -97,6 +98,14 @@ const char **      adcli_enroll_get_service_principals  (adcli_enroll *enroll);
 void               adcli_enroll_set_service_principals  (adcli_enroll *enroll,
                                                          const char **value);
 
+const char **      adcli_enroll_get_service_principals_to_add (adcli_enroll *enroll);
+void               adcli_enroll_add_service_principal_to_add (adcli_enroll *enroll,
+                                                              const char *value);
+
+const char **      adcli_enroll_get_service_principals_to_remove (adcli_enroll *enroll);
+void               adcli_enroll_add_service_principal_to_remove (adcli_enroll *enroll,
+                                                                 const char *value);
+
 const char *       adcli_enroll_get_user_principal      (adcli_enroll *enroll);
 
 void               adcli_enroll_set_user_principal      (adcli_enroll *enroll,
@@ -108,6 +117,10 @@ unsigned int       adcli_enroll_get_computer_password_lifetime (adcli_enroll *en
 void               adcli_enroll_set_computer_password_lifetime (adcli_enroll *enroll,
                                                          unsigned int lifetime);
 
+bool               adcli_enroll_get_trusted_for_delegation (adcli_enroll *enroll);
+void               adcli_enroll_set_trusted_for_delegation (adcli_enroll *enroll,
+                                                            bool value);
+
 krb5_kvno          adcli_enroll_get_kvno                (adcli_enroll *enroll);
 
 void               adcli_enroll_set_kvno                (adcli_enroll *enroll,
@@ -125,6 +138,8 @@ krb5_enctype *     adcli_enroll_get_keytab_enctypes     (adcli_enroll *enroll);
 void               adcli_enroll_set_keytab_enctypes     (adcli_enroll *enroll,
                                                          krb5_enctype *enctypes);
 
+krb5_enctype *     adcli_enroll_get_permitted_keytab_enctypes (adcli_enroll *enroll);
+
 const char *       adcli_enroll_get_os_name             (adcli_enroll *enroll);
 
 void               adcli_enroll_set_os_name             (adcli_enroll *enroll,
@@ -140,4 +155,9 @@ const char *       adcli_enroll_get_os_service_pack     (adcli_enroll *enroll);
 void               adcli_enroll_set_os_service_pack     (adcli_enroll *enroll,
                                                          const char *value);
 
+void               adcli_enroll_set_samba_data_tool     (adcli_enroll *enroll,
+                                                         const char *value);
+
+const char *       adcli_enroll_get_samba_data_tool     (adcli_enroll *enroll);
+
 #endif /* ADENROLL_H_ */

data/ext/radcli/radenroll.c

@@ -200,6 +200,36 @@ static VALUE radenroll_join (VALUE self) {
     return self;
 }
 
+/*
+ * call-seq:
+ *
+ * adenroll.update
+ *
+ * Updates a computer object
+ *
+ */
+static VALUE radenroll_update (VALUE self) {
+    RUBY_ADENROLL *ptr_enroll;
+    adcli_result result;
+    const char* c_computer_password = NULL;
+    adcli_enroll_flags flags = ADCLI_ENROLL_NO_KEYTAB;
+
+    Data_Get_Struct (self, RUBY_ADENROLL, ptr_enroll);
+
+    c_computer_password = adcli_enroll_get_computer_password (ptr_enroll->enroll);
+    if (c_computer_password != NULL) {
+      flags |= ADCLI_ENROLL_PASSWORD_VALID;
+    }
+
+    result = adcli_enroll_update (ptr_enroll->enroll, flags);
+
+    if(result != ADCLI_SUCCESS) {
+        rb_raise(rb_eRuntimeError, "%s", adcli_get_last_error());
+    }
+
+    return self;
+}
+
 /*
  * call-seq
  *
@@ -270,6 +300,7 @@ void Init_AdEnroll()
     rb_define_method (c_adenroll, "set_computer_password", radenroll_set_computer_password, 1);
 
     rb_define_method (c_adenroll, "join", radenroll_join, 0);
+    rb_define_method (c_adenroll, "update", radenroll_update, 0);
     rb_define_method (c_adenroll, "password", radenroll_password, 0);
     rb_define_method (c_adenroll, "delete", radenroll_delete, 0);
 

data/install.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sudo apt-get install libkrb5-dev libldap2-dev libsasl2-dev
+sudo gem install radcli
+

data/radcli.gemspec

@@ -2,11 +2,11 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
     spec.name       = 'radcli'
-    spec.version    = '1.0.0'
+    spec.version    = '1.1.0'
     spec.authors    = ['Mårten Cassel']
     spec.license    = 'Artistic-2.0'
     spec.email      = ['marten.cassel@gmail.com']
-    spec.homepage   = 'http://github.com/martencassel/radcli'
+    spec.homepage   = 'https://github.com/martencassel/radcli'
     spec.summary    = 'A Ruby interface for the adcli library'
     spec.test_files = Dir['test/test*']
     spec.extensions = ['ext/radcli/extconf.rb']

data/test/test_radconn.rb

@@ -103,8 +103,5 @@ class TC_Adconn < Test::Unit::TestCase
     password = @conn.get_user_password()
     assert_equal(@user_password, password)
   end
-
-  def teardown
-  end
-
+ 
 end

data/test/test_radenroll.rb

@@ -68,7 +68,4 @@ class TC_AdEnroll < Test::Unit::TestCase
     assert_equal(@computer_password, computer_password)
   end
 
-  def teardown
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radcli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mårten Cassel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-31 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -53,6 +53,8 @@ extra_rdoc_files:
 - ext/radcli/radconn.c
 - ext/radcli/radenroll.c
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/devcontainer.json"
 - CHANGES
 - LICENSE
 - MANIFEST
@@ -68,6 +70,7 @@ files:
 - ext/radcli/radcli.h
 - ext/radcli/radconn.c
 - ext/radcli/radenroll.c
+- install.sh
 - radcli.gemspec
 - scripts/delete.rb
 - scripts/fail_adconnect.rb
@@ -75,7 +78,7 @@ files:
 - scripts/reset.rb
 - test/test_radconn.rb
 - test/test_radenroll.rb
-homepage: http://github.com/martencassel/radcli
+homepage: https://github.com/martencassel/radcli
 licenses:
 - Artistic-2.0
 metadata: {}
@@ -94,8 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Ruby interface for the adcli library