bbbctl 0.1.0__tar.gz → 0.3.0__tar.gz

{bbbctl-0.1.0/src/bbbctl.egg-info → bbbctl-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bbbctl
-Version: 0.1.0
+Version: 0.3.0
 Summary: BigBlueButton API command-line client
 Home-page: https://github.com/defnull/bbbctl
 Author: Marcel Hellkamp

{bbbctl-0.1.0 → bbbctl-0.3.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bbbctl
-version = 0.1.0
+version = 0.3.0
 author = Marcel Hellkamp
 author_email = marc@gsites.de
 description = BigBlueButton API command-line client

{bbbctl-0.1.0 → bbbctl-0.3.0/src/bbbctl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bbbctl
-Version: 0.1.0
+Version: 0.3.0
 Summary: BigBlueButton API command-line client
 Home-page: https://github.com/defnull/bbbctl
 Author: Marcel Hellkamp

{bbbctl-0.1.0 → bbbctl-0.3.0}/src/bbbctl.py

@@ -6,10 +6,9 @@ import urllib.parse
 import hashlib
 import sys, os
 import xml.etree.ElementTree as ET
-from xml.dom import minidom
 import json
 import datetime
-import re
+import ssl
 
 __all__ = ["BBBApiClient", "ApiError"]
 
@@ -23,9 +22,10 @@ class ApiError(RuntimeError):
 
 
 class BBBApiClient:
-    def __init__(self, api, secret):
+    def __init__(self, api, secret, ssl_context=None):
         self.api = api.rstrip("/")
         self.secret = secret
+        self.ssl = ssl_context or ssl.create_default_context()
 
     def makeurl(self, command, **query):
         query = urllib.parse.urlencode(query)
@@ -39,7 +39,7 @@ class BBBApiClient:
 
     def call(self, command, **query):
         url = self.makeurl(command, **query)
-        with urllib.request.urlopen(url) as f:
+        with urllib.request.urlopen(url, context=self.ssl) as f:
             xml = f.read().decode("utf8")
         root = ET.fromstring(xml)
         if root.find("./returncode").text != "SUCCESS":
@@ -84,6 +84,10 @@ def build_parser():
         "--secret",
         help="API secretd (default: BBBCTL_SECRET or local config)",
     )
+    parser.add_argument(
+        "--insecure",
+        help="Skip TLS verification and accept self-signed or invalid SSL certificates as if they were valid",
+    )
 
     parser.add_argument(
         "--format",
@@ -125,7 +129,7 @@ def build_parser():
 
     cmd = meet_sub.add_parser("list", help="List meetings")
     cmd.add_argument("--sort", help="Sort by a specific key")
-    cmd.add_argument("--no-user", action="store_true", help="Do not show participatns")
+    cmd.add_argument("--no-user", action="store_true", help="Do not show participants")
     cmd.set_defaults(cmd=cmd_meet_list)
 
     cmd = meet_sub.add_parser("info", help="Show meeting details")
@@ -135,10 +139,10 @@ def build_parser():
     cmd = meet_sub.add_parser("create", help="Create meeting")
     cmd.add_argument("id", help="Meeting ID")
     cmd.add_argument("name", help="Meeting name")
-    cmd.add_argument("--record", help="Allow recodring?", action="store_true")
+    cmd.add_argument("--record", help="Allow recording?", action="store_true")
     cmd.add_argument(
         "--mod",
-        help="Directly create and print a join link for this username. Can be repeated.",
+        help="Directly create and print a moderator join link for this username. Can be repeated.",
         action="append",
     )
     cmd.set_defaults(cmd=cmd_meet_create)
@@ -161,7 +165,8 @@ def build_parser():
     cmd.set_defaults(cmd=cmd_meet_end)
 
     cmd = meet_sub.add_parser("nuke", help="End ALL meeting")
-    cmd.add_argument("--doit", help="Really end all meetings?", action="store_true")
+    cmd.add_argument("--doit", help="Disable dry-run mode and actually end meetings?", action="store_true")
+    cmd.add_argument("--ask", help="Ask for every meeting?", action="store_true")
     cmd.set_defaults(cmd=cmd_meet_nuke)
 
     return parser
@@ -176,6 +181,7 @@ config_paths = [
     "/etc/bigbluebutton/bbb-web.properties",
     "/usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties",
     "/var/lib/tomcat7/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties",
+    "./bbbctl.conf",
 ]
 
 
@@ -213,12 +219,17 @@ def main():
     )
 
     server = server.rstrip("/")
-    if '://' not in server:
+    if "://" not in server:
         server = "https://" + server
     if not server.endswith("/bigbluebutton/api"):
         server += "/bigbluebutton/api"
 
-    client = BBBApiClient(server, secret)
+    ctx = ssl.create_default_context()
+    if args.insecure:
+        ctx.check_hostname = False
+        ctx.verify_mode = ssl.CERT_NONE
+
+    client = BBBApiClient(server, secret, ssl_context=ctx)
 
     try:
         args.cmd(client, args)
@@ -249,7 +260,7 @@ def format_human(e, indent=""):
     result = indent + e.tag + ":"
     if e.tag.lower() in ("starttime", "endtime"):
         value = "%s (%s)" % (
-            datetime.datetime.utcfromtimestamp(float(value) / 1000),
+            datetime.datetime.fromtimestamp(float(value) / 1000, datetime.timezone.utc),
             value,
         )
     if value:
@@ -278,7 +289,19 @@ def format_json(e, *a, **ka):
 
 
 _should_be_list = ["attendees"]
-_should_be_number = ["createTime", "duration", "startTime", "endTime", "participantCount", "listenerCount", "voiceParticipantCount", "videoCount", "maxUsers", "moderatorCount"] 
+_should_be_number = [
+    "createTime",
+    "duration",
+    "startTime",
+    "endTime",
+    "participantCount",
+    "listenerCount",
+    "voiceParticipantCount",
+    "videoCount",
+    "maxUsers",
+    "moderatorCount",
+]
+
 
 def _unpack_xml(e):
     if e.tag in _should_be_list:
@@ -290,8 +313,8 @@ def _unpack_xml(e):
         return int(value)
     if not value:
         return None
-    if value in ('true', 'false'):
-        return value == 'true'
+    if value in ("true", "false"):
+        return value == "true"
     return value
 
 
@@ -351,7 +374,8 @@ def cmd_meet_create(api, args):
             link = api.getJoinLink(
                 meetingID=args.id,
                 fullName=name,
-                password=created.find("moderatorPW").text,
+                createTime=created.find("createTime").text,
+                role="MODERATOR",
             )
         print(name + ":", link)
 
@@ -365,6 +389,7 @@ def cmd_meet_join(api, args):
 
     if args.open:
         import webbrowser
+
         webbrowser.open_new_tab(link)
     else:
         print(link)
@@ -378,11 +403,6 @@ def cmd_meet_end(api, args):
 def cmd_meet_nuke(api, args):
     meetings = list(api.getMeetings())
     for meeting in meetings:
-        if args.doit:
-            api.end(
-                meetingID=meeting.find("meetingID").text,
-                password=meeting.find("moderatorPW").text,
-            )
         print(
             "{dryrun}id={id} user={users} name={name!r}".format(
                 dryrun="" if args.doit else "(dry run) ",
@@ -391,6 +411,16 @@ def cmd_meet_nuke(api, args):
                 name=meeting.find("meetingName").text,
             )
         )
+        if args.doit:
+            if args.ask:
+                answer = input("End this meeting? [Yna] ").strip().lower()
+                if answer == "a":
+                    args.ask = False
+                elif answer in ("", "y"):
+                    pass
+                else:
+                    continue
+            api.end(meetingID=meeting.find("meetingID").text)
 
 
 if __name__ == "__main__":